1 files changed, 7 insertions, 0 deletions
diff --git a/railties/lib/rails/application/finisher.rb b/railties/lib/rails/application/finisher.rb
index 7a1bb1e25c..0599e988d9 100644
--- a/railties/lib/rails/application/finisher.rb
+++ b/railties/lib/rails/application/finisher.rb
@@ -108,6 +108,13 @@ module Rails
           ActionDispatch::Reloader.to_cleanup(&callback)
         end
       end
+
+      # Disable dependency loading during request cycle
+      initializer :disable_dependency_loading do
+        if config.eager_load && config.cache_classes
+          ActiveSupport::Dependencies.unhook!
+        end
+      end
     end
   end
 end