2 files changed, 43 insertions, 30 deletions

diff --git a/activesupport/lib/active_support/cache.rb b/activesupport/lib/active_support/cache.rb
index 5a064f8bea..95eae3a77e 100644
--- a/activesupport/lib/active_support/cache.rb
+++ b/activesupport/lib/active_support/cache.rb
@@ -39,10 +39,6 @@ module ActiveSupport
     class Store
       cattr_accessor :logger
 
-      def threadsafe!
-        extend ThreadSafety
-      end
-
       def silence!
         @silence = true
         self
@@ -115,20 +111,6 @@ module ActiveSupport
           logger.debug("Cache #{operation}: #{key}#{options ? " (#{options.inspect})" : ""}") if logger && !@silence && !@logger_off
         end
     end
-
-    module ThreadSafety #:nodoc:
-      def self.extended(object) #:nodoc:
-        object.instance_variable_set(:@mutex, Mutex.new)
-      end
-
-      %w(read write delete delete_matched exist? increment decrement).each do |method|
-        module_eval <<-EOS, __FILE__, __LINE__
-          def #{method}(*args)
-            @mutex.synchronize { super }
-          end
-        EOS
-      end
-    end
   end
 end
 
diff --git a/activesupport/lib/active_support/cache/memory_store.rb b/activesupport/lib/active_support/cache/memory_store.rb
index 6f114273e4..9332d50f24 100644
--- a/activesupport/lib/active_support/cache/memory_store.rb
+++ b/activesupport/lib/active_support/cache/memory_store.rb
@@ -3,36 +3,67 @@ module ActiveSupport
     class MemoryStore < Store
       def initialize
         @data = {}
+        @mutex = Mutex.new
+      end
+
+      def fetch(key, options = {})
+        @mutex.synchronize do
+          super
+        end
       end
 
       def read(name, options = nil)
-        super
-        @data[name]
+        @mutex.synchronize do
+          super
+          @data[name]
+        end
       end
 
       def write(name, value, options = nil)
-        super
-        @data[name] = value
+        @mutex.synchronize do
+          super
+          @data[name] = value
+        end
       end
 
       def delete(name, options = nil)
-        super
-        @data.delete(name)
+        @mutex.synchronize do
+          super
+          @data.delete(name)
+        end
       end
 
       def delete_matched(matcher, options = nil)
-        super
-        @data.delete_if { |k,v| k =~ matcher }
+        @mutex.synchronize do
+          super
+          @data.delete_if { |k,v| k =~ matcher }
+        end
       end
 
       def exist?(name,options = nil)
-        super
-        @data.has_key?(name)
+        @mutex.synchronize do
+          super
+          @data.has_key?(name)
+        end
+      end
+
+      def increment(key, amount = 1)
+        @mutex.synchronize do
+          super
+        end
+      end
+
+      def decrement(key, amount = 1)
+        @mutex.synchronize do
+          super
+        end
       end
 
       def clear
-        @data.clear
+        @mutex.synchronize do
+          @data.clear
+        end
       end
     end
   end
-end
\ No newline at end of file
+end