Revert "Lazy load cache and session stores"

This reverts commit 19895f087c338d8385dff9d272d30fb87cb10330.

2 files changed, 6 insertions, 4 deletions

diff --git a/activesupport/lib/active_support/cache.rb b/activesupport/lib/active_support/cache.rb
index 07c83774df..2f1143e610 100644
--- a/activesupport/lib/active_support/cache.rb
+++ b/activesupport/lib/active_support/cache.rb
@@ -7,13 +7,10 @@ module ActiveSupport
 
       case store
       when Symbol
-        require "active_support/cache/#{store.to_s}"
-
         store_class_name = (store == :drb_store ? "DRbStore" : store.to_s.camelize)
         store_class = ActiveSupport::Cache.const_get(store_class_name)
         store_class.new(*parameters)
       when nil
-        require "active_support/cache/memory_store"
         ActiveSupport::Cache::MemoryStore.new
       else
         store
@@ -140,3 +137,9 @@ module ActiveSupport
     end
   end
 end
+
+require 'active_support/cache/file_store'
+require 'active_support/cache/memory_store'
+require 'active_support/cache/drb_store'
+require 'active_support/cache/mem_cache_store'
+require 'active_support/cache/compressed_mem_cache_store'
diff --git a/activesupport/lib/active_support/cache/drb_store.rb b/activesupport/lib/active_support/cache/drb_store.rb
index f06f08f566..b80c2ee4d5 100644
--- a/activesupport/lib/active_support/cache/drb_store.rb
+++ b/activesupport/lib/active_support/cache/drb_store.rb
@@ -1,5 +1,4 @@
 require 'drb'
-require 'active_support/cache/memory_store'
 
 module ActiveSupport
   module Cache