diff --git a/railties/lib/rails/application.rb b/railties/lib/rails/application.rb
index 66a1f88c61..92f03f06bf 100644
--- a/railties/lib/rails/application.rb
+++ b/railties/lib/rails/application.rb
@@ -140,6 +140,7 @@ module Rails
     def assets
       @assets ||= build_asset_environment
     end
+    attr_writer :assets
 
     def build_asset_environment
       return unless config.assets.enabled
diff --git a/railties/lib/rails/application/finisher.rb b/railties/lib/rails/application/finisher.rb
index be063e5f25..bae464a840 100644
--- a/railties/lib/rails/application/finisher.rb
+++ b/railties/lib/rails/application/finisher.rb
@@ -48,6 +48,12 @@ module Rails
         end
       end
 
+      initializer :index_sprockets_environment do |app|
+        if config.assets.enabled && config.action_controller.perform_caching
+          app.assets = app.assets.index
+        end
+      end
+
       initializer :build_middleware_stack do
         build_middleware_stack
       end