diff --git a/actionpack/lib/action_controller/assertions.rb b/actionpack/lib/action_controller/assertions.rb
index fe16b97bd3..7f72e12050 100644
--- a/actionpack/lib/action_controller/assertions.rb
+++ b/actionpack/lib/action_controller/assertions.rb
@@ -1,4 +1,3 @@
-require 'test/unit'
 require 'test/unit/assertions'
 
 module ActionController #:nodoc:
diff --git a/activesupport/CHANGELOG b/activesupport/CHANGELOG
index e92ceb1362..7187d6060c 100644
--- a/activesupport/CHANGELOG
+++ b/activesupport/CHANGELOG
@@ -1,5 +1,7 @@
 *SVN*
 
+* Fixed cache_page to use the request url instead of the routing options when picking a save path #8614 [josh]
+
 * Object.subclasses_of includes anonymous subclasses.  [Jeremy Kemper]
 
 * Fixed that pluralizing an empty string should return the same empty string, not "s" #7720 [josh]