2 files changed, 12 insertions, 15 deletions
diff --git a/actionpack/lib/action_dispatch/http/rack_cache.rb b/actionpack/lib/action_dispatch/http/rack_cache.rb
index b5c1435903..cc8edee300 100644
--- a/actionpack/lib/action_dispatch/http/rack_cache.rb
+++ b/actionpack/lib/action_dispatch/http/rack_cache.rb
@@ -14,11 +14,15 @@ module ActionDispatch
     end
 
     def read(key)
-      @store.read(key) || []
+      if data = @store.read(key)
+        Marshal.load(data)
+      else
+        []
+      end
     end
 
     def write(key, value)
-      @store.write(key, value)
+      @store.write(key, Marshal.dump(value))
     end
 
     ::Rack::Cache::MetaStore::RAILS = self
diff --git a/actionpack/lib/action_dispatch/testing/performance_test.rb b/actionpack/lib/action_dispatch/testing/performance_test.rb
index e7aeb45fb3..13fe693c32 100644
--- a/actionpack/lib/action_dispatch/testing/performance_test.rb
+++ b/actionpack/lib/action_dispatch/testing/performance_test.rb
@@ -1,17 +1,10 @@
 require 'active_support/testing/performance'
 
-begin
-  module ActionDispatch
-    # An integration test that runs a code profiler on your test methods.
-    # Profiling output for combinations of each test method, measurement, and
-    # output format are written to your tmp/performance directory.
-    #
-    # By default, process_time is measured and both flat and graph_html output
-    # formats are written, so you'll have two output files per test method.
-    class PerformanceTest < ActionDispatch::IntegrationTest
-      include ActiveSupport::Testing::Performance
-    end
+module ActionDispatch
+  # An integration test that runs a code profiler on your test methods.
+  # Profiling output for combinations of each test method, measurement, and
+  # output format are written to your tmp/performance directory.
+  class PerformanceTest < ActionDispatch::IntegrationTest
+    include ActiveSupport::Testing::Performance
   end
-rescue NameError
-  $stderr.puts "Specify ruby-prof as application's dependency in Gemfile to run benchmarks."
 end