0
@@ -1,19 +1,5 @@
0
 module ActiveSupport
0
   module Memoizable #:nodoc:
0
-    def self.extended(obj)
0
-      klass = obj.respond_to?(:class_eval) ? obj : obj.metaclass
0
-      klass.class_eval do
0
-        def freeze
0
-          methods.each do |method|
0
-            if m = method.to_s.match(/^unmemoized_(.*)/)
0
-              send(m[1])
0
-            end
0
-          end
0
-          super
0
-        end
0
-      end
0
-    end
0
-
0
     def memoize(*symbols)
0
       symbols.each do |symbol|
0
         original_method = "unmemoized_#{symbol}"
0
@@ -23,6 +9,18 @@ module ActiveSupport
0
         raise "Already memoized #{symbol}" if klass.instance_methods.map(&:to_s).include?(original_method)
0
 
0
         klass.class_eval <<-EOS, __FILE__, __LINE__
0
+          unless instance_methods.map(&:to_s).include?("freeze_without_memoizable")
0
+            alias_method :freeze_without_memoizable, :freeze
0
+            def freeze
0
+              methods.each do |method|
0
+                if m = method.to_s.match(/^unmemoized_(.*)/)
0
+                  send(m[1])
0
+                end
0
+              end
0
+              freeze_without_memoizable
0
+            end
0
+          end
0
+
0
           alias_method :#{original_method}, :#{symbol}
0
           def #{symbol}(reload = false)
0
             if !reload && defined? #{memoized_ivar}