diff --git a/src/main/java/io/ebeaninternal/server/cache/CacheChangeSet.java b/src/main/java/io/ebeaninternal/server/cache/CacheChangeSet.java
index 4fdde31ad..b25ba9ce5 100644
--- a/src/main/java/io/ebeaninternal/server/cache/CacheChangeSet.java
+++ b/src/main/java/io/ebeaninternal/server/cache/CacheChangeSet.java
@@ -83,6 +83,7 @@ public class CacheChangeSet {
    */
   public void addClearQuery(BeanDescriptor<?> descriptor) {
     queryCaches.add(descriptor);
+    touchedTables.add(descriptor.getBaseTable());
   }
 
   /**
diff --git a/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptorCacheHelp.java b/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptorCacheHelp.java
index b59fc8a11..329846ff2 100644
--- a/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptorCacheHelp.java
+++ b/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptorCacheHelp.java
@@ -908,7 +908,6 @@ final class BeanDescriptorCacheHelp<T> {
     if (noCaching) {
       return;
     }
-    changeSet.addInvalidate(desc);
     changeSet.addClearQuery(desc);
     // inserts don't invalidate the bean cache
     if (tableIUD.isUpdateOrDelete()) {