diff --git a/config/environments/production.rb b/config/environments/production.rb
index 217c0f76a..9d45caf19 100644
--- a/config/environments/production.rb
+++ b/config/environments/production.rb
@@ -54,7 +54,11 @@
   config.log_tags = [ :request_id ]
 
   # Use a different cache store in production.
-  config.cache_store = :mem_cache_store
+  # config.cache_store = :mem_cache_store
+  config.cache_store = :memory_store
+  config.public_file_server.headers = {
+    'Cache-Control' => "public, max-age=#{10.minutes.to_i}"
+  }
 
   # Use a real queuing backend for Active Job (and separate queues per environment).
   config.active_job.queue_adapter     = :sidekiq
diff --git a/config/environments/staging.rb b/config/environments/staging.rb
index de4c2acf7..1bb4f439b 100644
--- a/config/environments/staging.rb
+++ b/config/environments/staging.rb
@@ -54,7 +54,11 @@
   config.log_tags = [ :request_id ]
 
   # Use a different cache store in staging.
-  config.cache_store = :mem_cache_store
+  # config.cache_store = :mem_cache_store
+  config.cache_store = :memory_store
+  config.public_file_server.headers = {
+    'Cache-Control' => "public, max-age=#{10.minutes.to_i}"
+  }
 
   # Use a real queuing backend for Active Job (and separate queues per environment).
   config.active_job.queue_adapter     = :sidekiq