2 files changed, 4 insertions, 7 deletions
diff --git a/actionpack/lib/action_dispatch/middleware/cookies.rb b/actionpack/lib/action_dispatch/middleware/cookies.rb
index dd1f140051..9a1e2bd45c 100644
--- a/actionpack/lib/action_dispatch/middleware/cookies.rb
+++ b/actionpack/lib/action_dispatch/middleware/cookies.rb
@@ -8,7 +8,7 @@ require 'active_support/json'
 module ActionDispatch
   class Request < Rack::Request
     def cookie_jar
-      env['action_dispatch.cookies'] ||= Cookies::CookieJar.build(self)
+      env['action_dispatch.cookies'] ||= Cookies::CookieJar.build(env, host, ssl?, cookies)
     end
   end
 
@@ -228,16 +228,12 @@ module ActionDispatch
         }
       end
 
-      def self.build(request)
-        env = request.env
+      def self.build(env, host, secure, cookies)
         key_generator = env[GENERATOR_KEY]
         options = options_for_env env
 
-        host = request.host
-        secure = request.ssl?
-
         new(key_generator, host, secure, options).tap do |hash|
-          hash.update(request.cookies)
+          hash.update(cookies)
         end
       end
 
diff --git a/actionpack/test/controller/caching_test.rb b/actionpack/test/controller/caching_test.rb
index f21dd87400..4f5af85fea 100644
--- a/actionpack/test/controller/caching_test.rb
+++ b/actionpack/test/controller/caching_test.rb
@@ -381,6 +381,7 @@ class AutomaticCollectionCacheTest < ActionController::TestCase
     @controller.perform_caching = true
     @controller.partial_rendered_times = 0
     @controller.cache_store = ActiveSupport::Cache::MemoryStore.new
+    ActionView::PartialRenderer.collection_cache = @controller.cache_store
   end
 
   def test_collection_fetches_cached_views