1 files changed, 15 insertions, 9 deletions
diff --git a/lib/gitlab/json_cache.rb b/lib/gitlab/json_cache.rb
index 41c18f82a4b..d5c018cfc68 100644
--- a/lib/gitlab/json_cache.rb
+++ b/lib/gitlab/json_cache.rb
@@ -2,12 +2,17 @@
 
 module Gitlab
   class JsonCache
-    attr_reader :backend, :cache_key_with_version, :namespace
+    attr_reader :backend, :namespace
+
+    STRATEGY_KEY_COMPONENTS = {
+      revision: Gitlab.revision,
+      version: [Gitlab::VERSION, Rails.version]
+    }.freeze
 
     def initialize(options = {})
       @backend = options.fetch(:backend, Rails.cache)
       @namespace = options.fetch(:namespace, nil)
-      @cache_key_with_version = options.fetch(:cache_key_with_version, true)
+      @cache_key_strategy = options.fetch(:cache_key_strategy, :revision)
     end
 
     def active?
@@ -19,13 +24,12 @@ module Gitlab
     end
 
     def cache_key(key)
-      expanded_cache_key = [namespace, key].compact
-
-      if cache_key_with_version
-        expanded_cache_key << [Gitlab::VERSION, Rails.version]
-      end
+      expanded_cache_key = [namespace, key, *strategy_key_component].compact
+      expanded_cache_key.join(':').freeze
+    end
 
-      expanded_cache_key.flatten.join(':').freeze
+    def strategy_key_component
+      STRATEGY_KEY_COMPONENTS.fetch(@cache_key_strategy)
     end
 
     def expire(key)
@@ -39,7 +43,9 @@ module Gitlab
     end
 
     def write(key, value, options = nil)
-      backend.write(cache_key(key), value.to_json, options)
+      # As we use json as the serialization format, return everything from
+      # ActiveModel objects included encrypted values.
+      backend.write(cache_key(key), value.to_json(unsafe_serialization_hash: true), options)
     end
 
     def fetch(key, options = {}, &block)