Using cache when within a transaction if already loaded

Author: tjoyal

lib/identity_cache/belongs_to_caching.rb

@@ -34,12 +34,12 @@ def build_normalized_belongs_to_cache(association, options)
         foreign_key = options[:association_reflection].foreign_key
         self.class_eval(<<-CODE, __FILE__, __LINE__ + 1)
           def #{options[:cached_accessor_name]}
-            if IdentityCache.should_use_cache? && #{foreign_key}.present? && !association(:#{association}).loaded?
-              if instance_variable_defined?(:@#{options[:records_variable_name]})
-                @#{options[:records_variable_name]}
-              else
-                @#{options[:records_variable_name]} = association(:#{association}).klass.fetch_by_id(#{foreign_key})
-              end
+            if association(:#{association}).loaded? || #{foreign_key}.blank?
+              #{association}
+            elsif instance_variable_defined?(:@#{options[:records_variable_name]})
+              @#{options[:records_variable_name]}
+            elsif IdentityCache.should_use_cache?
+              @#{options[:records_variable_name]} = association(:#{association}).klass.fetch_by_id(#{foreign_key})
             else
               #{association}
             end