Do not call should_use_cache? on prefetched/embedded assocs

lib/identity_cache.rb

@@ -218,6 +218,16 @@ def fetch_in_batches(keys, &block)
  end
  end
  end
+
+ private
+
+ def mark_as_loaded_by_idc
+ @loaded_by_idc = true
+ end
+
+ def loaded_by_idc?
+ defined?(@loaded_by_idc)
+ end
 end
 
 require "identity_cache/railtie" if defined?(Rails)

lib/identity_cache/cached/belongs_to.rb

@@ -9,7 +9,7 @@ def build
  reflection.active_record.class_eval(<<-RUBY, __FILE__, __LINE__ + 1)
  def #{cached_accessor_name}
  association_klass = association(:#{name}).klass
- if association_klass.should_use_cache? && #{reflection.foreign_key}.present? && !association(:#{name}).loaded?
+ if (loaded_by_idc? || association_klass.should_use_cache?) && #{reflection.foreign_key}.present? && !association(:#{name}).loaded?
  if defined?(#{records_variable_name})
  #{records_variable_name}
  else

lib/identity_cache/cached/primary_index.rb

@@ -55,6 +55,7 @@ def cache_key(id)
  def load_one_from_db(id)
  record = build_query(id).take
  model.send(:setup_embedded_associations_on_miss, [record]) if record
+ record.send(:mark_as_loaded_by_idc)
  record
  end
 

lib/identity_cache/cached/recursive/association.rb

@@ -25,7 +25,7 @@ def build
  def read(record)
  assoc = record.association(name)
 
- if assoc.klass.should_use_cache? && !assoc.loaded? && assoc.target.blank?
+ if (record.send(:loaded_by_idc?) || assoc.klass.should_use_cache?) && !assoc.loaded? && assoc.target.blank?
  if record.instance_variable_defined?(records_variable_name)
  record.instance_variable_get(records_variable_name)
  elsif record.instance_variable_defined?(dehydrated_variable_name)

lib/identity_cache/cached/reference/has_many.rb

@@ -22,7 +22,7 @@ def #{cached_ids_name}
 
  def #{cached_accessor_name}
  assoc = association(:#{name})
- if assoc.klass.should_use_cache? && !assoc.loaded? && assoc.target.blank?
+ if (loaded_by_idc? || assoc.klass.should_use_cache?) && !assoc.loaded? && assoc.target.blank?
  #{records_variable_name} ||= #{reflection.class_name}.fetch_multi(#{cached_ids_name})
  else
  #{name}.to_a

lib/identity_cache/encoder.rb

@@ -69,6 +69,7 @@ def embedded_coder(record, _association, cached_association)
 
  def record_from_coder(coder, klass) # :nodoc:
  record = klass.instantiate(coder[:attributes].dup)
+ record.send(:mark_as_loaded_by_idc)
 
  if coder.key?(:associations)
  coder[:associations].each do |name, value|

test/fetch_test.rb

@@ -342,6 +342,31 @@ def test_returned_records_are_not_readonly_with_open_transactions
  end
  end
 
+ def test_should_use_cache_not_called_on_prefetched
+ Item.send(:cache_belongs_to, :item)
+
+ bob = Item.create!(title: "bob")
+ john = Item.create!(title: "john")
+ bob.update_column(:item_id, john.id)
+
+ item = Item.fetch(bob.id, includes: [:item])
+ IdentityCache.expects(:should_use_cache?).never
+ item.fetch_item
+ end
+
+ def test_should_use_cache_not_called_on_embedded
+ Item.send(:cache_has_many, :associated_records, embed: true)
+
+ bob = Item.create!(title: "bob")
+
+ associated1 = bob.associated_records.create!(name: "foo")
+ associated2 = bob.associated_records.create!(name: "bar")
+
+ item = Item.fetch(bob.id)
+ IdentityCache.expects(:should_use_cache?).never
+ item.fetch_associated_records
+ end
+
  def test_respects_should_use_cache_on_record
  @record.save
  Item.stubs(:should_use_cache?).returns(false)