diff --git a/core/app/models/spree/preferences/configuration.rb b/core/app/models/spree/preferences/configuration.rb
index 64365a4c5d3..8636c96ed4f 100644
--- a/core/app/models/spree/preferences/configuration.rb
+++ b/core/app/models/spree/preferences/configuration.rb
@@ -29,7 +29,7 @@ def configure
     end
 
     def preference_cache_key(name)
-      [self.class.name, name].join('::').underscore
+      [ENV['RAILS_CACHE_ID'], self.class.name, name].flatten.join('::').underscore
     end
 
     def reset
diff --git a/core/app/models/spree/preferences/preferable.rb b/core/app/models/spree/preferences/preferable.rb
index 700c2e52a66..a02ab9265d3 100644
--- a/core/app/models/spree/preferences/preferable.rb
+++ b/core/app/models/spree/preferences/preferable.rb
@@ -78,7 +78,7 @@ def prefers?(name)
 
   def preference_cache_key(name)
     return unless id
-    [self.class.name, name, id].join('::').underscore
+    [ENV["RAILS_CACHE_ID"], self.class.name, name, id].join('::').underscore
   end
 
   def save_pending_preferences