Merge branch 'master' into always-inherit-from-application-record

1 files changed, 5 insertions, 7 deletions

diff --git a/actionview/lib/action_view/railtie.rb b/actionview/lib/action_view/railtie.rb
index 67c80d22d8..dfb99f4ea9 100644
--- a/actionview/lib/action_view/railtie.rb
+++ b/actionview/lib/action_view/railtie.rb
@@ -37,16 +37,10 @@ module ActionView
       end
     end
 
-    initializer "action_view.collection_caching", after: "action_controller.set_configs" do |app|
-      ActiveSupport.on_load(:action_controller) do
-        PartialRenderer.collection_cache = app.config.action_controller.cache_store
-      end
-    end
-
     initializer "action_view.per_request_digest_cache" do |app|
       ActiveSupport.on_load(:action_view) do
         if app.config.consider_all_requests_local
-          app.middleware.use ActionView::Digestor::PerRequestDigestCacheExpiry
+          app.executor.to_run { ActionView::LookupContext::DetailsKey.clear }
         end
       end
     end
@@ -57,6 +51,10 @@ module ActionView
       end
     end
 
+    initializer "action_view.collection_caching", after: "action_controller.set_configs" do |app|
+      PartialRenderer.collection_cache = app.config.action_controller.cache_store
+    end
+
     rake_tasks do |app|
       unless app.config.api_only
         load "action_view/tasks/cache_digests.rake"