diff --git a/pisi/db/__init__.py b/pisi/db/__init__.py
index 72f2fe05..aa94080f 100644
--- a/pisi/db/__init__.py
+++ b/pisi/db/__init__.py
@@ -31,8 +31,9 @@ def update_caches():
             db.cache_save()
 
 def regenerate_caches():
-    flush_caches()
-    # Invalidate and flush caches to re-generate them when needed
+    # Force cache regeneration
     for db in [packagedb.PackageDB(), sourcedb.SourceDB(),
                componentdb.ComponentDB(), groupdb.GroupDB()]:
+        db.invalidate()
+        db.cache_flush()
         db.cache_regenerate()