diff --git a/lib/mastodon/redis_config.rb b/lib/mastodon/redis_config.rb
index 10672a535..96c2c2309 100644
--- a/lib/mastodon/redis_config.rb
+++ b/lib/mastodon/redis_config.rb
@@ -26,9 +26,8 @@ def setup_redis_env_url(prefix = nil, defaults = true)
 setup_redis_env_url(:cache, false)
 setup_redis_env_url(:sidekiq, false)
 
-namespace         = ENV.fetch('REDIS_NAMESPACE', nil)
-cache_namespace   = namespace ? "#{namespace}_cache" : 'cache'
-sidekiq_namespace = namespace
+namespace       = ENV.fetch('REDIS_NAMESPACE') { nil }
+cache_namespace = [namespace, 'cache', `git rev-parse --short HEAD`].compact.join('_')
 
 REDIS_CACHE_PARAMS = {
   driver: :hiredis,