diff --git a/Kwf/Util/ClearCache.php b/Kwf/Util/ClearCache.php
index <HASH>..<HASH> 100644
--- a/Kwf/Util/ClearCache.php
+++ b/Kwf/Util/ClearCache.php
@@ -59,7 +59,7 @@ class Kwf_Util_ClearCache
         }
         $tables = Zend_Registry::get('db')->fetchCol('SHOW TABLES');
         foreach ($tables as $table) {
-            if (substr($table, 0, 6) == 'cache_' && $table != 'cache_component') {
+            if (substr($table, 0, 6) == 'cache_') {
                 $ret[] = $table;
             }
         }
@@ -306,6 +306,13 @@ class Kwf_Util_ClearCache
                 if (in_array($t, $types) ||
                     (in_array('component', $types) && substr($t, 0, 15) == 'cache_component')
                 ) {
+                    if ($t == 'cache_component') {
+                        $cnt = Zend_Registry::get('db')->query("SELECT COUNT(*) FROM $t")->fetchColumn();
+                        if ($cnt > 1000) {
+                            if ($output) echo "skipped:     $t (won't delete $cnt entries, use clear-view-cache to clear)\n";
+                            continue;
+                        }
+                    }
                     Zend_Registry::get('db')->query("TRUNCATE TABLE $t");
                     if ($output) echo "cleared db:  $t\n";
                 }
clear view cache if less than <I> entries exist

for easier development