Patch run_callbacks instead of _run_commit_callbacks

CHANGELOG.md

@@ -2,6 +2,8 @@
 
 ## Unreleased
 
+- Patch `run_callbacks` instead of `_run_commit_callbacks` to expire cache prior to `after_commit` callbacks. (#602)
+
 ## 1.6.3
 
 - Split the `with_deferred_parent_expiration` and `with_deferred_parent_expiration`. (#578)

lib/identity_cache/query_api.rb

@@ -165,11 +165,20 @@ def cache_fetch_includes
     # cache reads that happen from the ordering of callbacks. For example, if an after_commit
     # callback enqueues a background job, then we don't want it to be possible for the
     # background job to run and load data from the cache before it is invalidated.
-    def _run_commit_callbacks
-      if destroyed? || transaction_changed_attributes.present?
-        expire_cache
+    if ActiveRecord.version >= Gem::Version.new("7.1")
+      def run_callbacks(kind, type = nil)
+        if kind == :commit && (destroyed? || transaction_changed_attributes.present?)
+          expire_cache
+        end
+        super
+      end
+    else
+      def run_callbacks(kind)
+        if kind == :commit && (destroyed? || transaction_changed_attributes.present?)
+          expire_cache
+        end
+        super
       end
-      super
     end
 
     # Invalidate the cache data associated with the record. Returns `true` on success,