diff --git a/railties/CHANGELOG b/railties/CHANGELOG
index 5ff1867568..6df7c568dc 100644
--- a/railties/CHANGELOG
+++ b/railties/CHANGELOG
@@ -1,5 +1,7 @@
 *Edge*
 
+* Turn cache_classes on by default [Josh Peek]
+
 * Added configurable eager load paths. Defaults to app/models, app/controllers, and app/helpers [Josh Peek]
 
 * Introduce simple internationalization support.  [Ruby i18n team]
diff --git a/railties/lib/initializer.rb b/railties/lib/initializer.rb
index 44c24e85f9..88341b9d73 100644
--- a/railties/lib/initializer.rb
+++ b/railties/lib/initializer.rb
@@ -903,7 +903,7 @@ Run `rake gems:install` to install the missing gems.
       end
 
       def default_cache_classes
-        false
+        true
       end
 
       def default_whiny_nils