diff --git a/wrap/gcache/cache.h b/wrap/gcache/cache.h
index 6f28cfe7..812bbecd 100644
--- a/wrap/gcache/cache.h
+++ b/wrap/gcache/cache.h
@@ -60,8 +60,11 @@ class Cache: public Provider<Token> {
       }
       this->heap.clear();
     }
-
-    assert(s_curr == 0);
+    if(!s_curr == 0) {
+      qDebug() << "Cache size after flush is not ZERO!";
+      s_curr = 0;
+    }
+    //assert(s_curr == 0);
 
     {
       for(unsigned int i = 0; i < tokens.size(); i++) {
diff --git a/wrap/gcache/controller.h b/wrap/gcache/controller.h
index 8f13bf81..dcac7b01 100644
--- a/wrap/gcache/controller.h
+++ b/wrap/gcache/controller.h
@@ -103,6 +103,7 @@ class Controller {
   }
 
   void finish() {
+    flush();
     stop();
   }