diff --git a/lib/cartodb/api/middlewares/cache-control-header.js b/lib/cartodb/api/middlewares/cache-control-header.js
index c3c57ea0..03a23592 100644
--- a/lib/cartodb/api/middlewares/cache-control-header.js
+++ b/lib/cartodb/api/middlewares/cache-control-header.js
@@ -42,5 +42,10 @@ module.exports = function setCacheControlHeader ({
 };
 
 function everyAffectedTablesCanBeInvalidated (affectedTables) {
-    return affectedTables && affectedTables.getTables().every(table => table.updated_at !== null);
+    const skipNotUpdatedAtTables = false;
+    const skipAnalysisCachedTables = true;
+
+    return affectedTables &&
+        affectedTables.getTables(skipNotUpdatedAtTables, skipAnalysisCachedTables)
+            .every(table => table.updated_at !== null);
 }
diff --git a/test/acceptance/cache/cache-control-header.js b/test/acceptance/cache/cache-control-header.js
index b962feb2..102741b9 100644
--- a/test/acceptance/cache/cache-control-header.js
+++ b/test/acceptance/cache/cache-control-header.js
@@ -150,7 +150,7 @@ describe.only('cache-control header', function () {
                             id: 'source_1',
                             type: 'source',
                             params: {
-                                query: 'select * from populated_places_simple_reduced'
+                                query: 'select * from test_table'
                             }
                         },
                         radius: 60000