diff --git a/sai/modules/saimod_sys_cache/qq/SYS_SAIMOD_CACHE.php b/sai/modules/saimod_sys_cache/qq/SYS_SAIMOD_CACHE.php
new file mode 100644
index 0000000..e2c6a86
--- /dev/null
+++ b/sai/modules/saimod_sys_cache/qq/SYS_SAIMOD_CACHE.php
@@ -0,0 +1,11 @@
+<?php
+namespace SYSTEM\DBD;
+class SYS_SAIMOD_CACHE extends \SYSTEM\DB\QQ {
+    public static function get_class(){return \get_class();}
+    public static function pqsql(){return
+'SELECT *, encode(data,\'base64\') FROM system.cache ORDER BY "ID" ASC LIMIT 100;';
+    }
+    public static function mysql(){return
+'SELECT * FROM system_cache ORDER BY ID ASC LIMIT 100;';
+    }
+}
\ No newline at end of file
diff --git a/sai/modules/saimod_sys_cache/qq/SYS_SAIMOD_CACHE_COUNT.php b/sai/modules/saimod_sys_cache/qq/SYS_SAIMOD_CACHE_COUNT.php
new file mode 100644
index 0000000..abd103d
--- /dev/null
+++ b/sai/modules/saimod_sys_cache/qq/SYS_SAIMOD_CACHE_COUNT.php
@@ -0,0 +1,11 @@
+<?php
+namespace SYSTEM\DBD;
+class SYS_SAIMOD_CACHE_COUNT extends \SYSTEM\DB\QQ {
+    public static function get_class(){return \get_class();}
+    public static function pqsql(){return
+'SELECT COUNT(*) as "count" FROM system.cache';
+    }
+    public static function mysql(){return
+'SELECT COUNT(*) as count FROM system_cache';
+    }
+}
\ No newline at end of file
diff --git a/sai/modules/saimod_sys_cache/saimod_sys_cache.php b/sai/modules/saimod_sys_cache/saimod_sys_cache.php
index a306a15..d804f47 100644
--- a/sai/modules/saimod_sys_cache/saimod_sys_cache.php
+++ b/sai/modules/saimod_sys_cache/saimod_sys_cache.php
@@ -1,45 +1,22 @@
 <?php
 namespace SYSTEM\SAI;
-
 class saimod_sys_cache extends \SYSTEM\SAI\SaiModule {    
     public static function sai_mod__SYSTEM_SAI_saimod_sys_cache(){
-        $con = new \SYSTEM\DB\Connection(\SYSTEM\system::getSystemDBInfo());
-        if(\SYSTEM\system::isSystemDbInfoPG()){
-            $res = $con->query('SELECT COUNT(*)as "count" FROM system.cache');
-        } else {
-            $res = $con->query('SELECT COUNT(*) as count FROM system_cache');
-        }
-        
-        $r = $res->next();
-        
-        $result =   '<h4>System Cache</h4><hr>'.
-                    'Entries: '.$r['count'].' showing 100'.
-                    '<table class="sai_table table table-hover table-condensed" style="overflow: auto;">'.                    
-                    '<tr>'.'<th>'.'ID'.'</th>'.'<th>'.'CacheID'.'</th>'.'<th>'.'Ident'.'</th>'.'<th>'.'Data'.'</th>'.'</tr>';        
-        
-        
-        if(\SYSTEM\system::isSystemDbInfoPG()){
-            $res = $con->query('SELECT *, encode(data,\'base64\') FROM system.cache ORDER BY "ID" ASC LIMIT 100;');
-        } else {
-            $res = $con->query('SELECT * FROM system_cache ORDER BY ID ASC LIMIT 100;');
-        }                        
-                
-        while($r = $res->next()){            
-            $result .= '<tr class="'.self::tablerow_class($r['CacheID']).'">'.'<td>'.$r['ID'].'</td>'.'<td>'.$r['CacheID'].'</td>'.'<td>'.$r['Ident'].'</td>'.'<td>'.'<img src="data:image/png;base64,'.$r['encode'].'">'.'</td>'.'</tr>';}
-            
-        $result .= '</table>';                
-        
-        return $result;
+        $vars = array();
+        $vars['count'] = \SYSTEM\DBD\SYS_SAIMOD_CACHE_COUNT::Q1()['count'];
+        $vars['entries'] = '';
+        $res = \SYSTEM\DBD\SYS_SAIMOD_CACHE::QQ();
+        while($r = $res->next()){
+            $r['class'] = self::tablerow_class($r['CacheID']);
+            $vars['entries'] .= \SYSTEM\PAGE\replace::replaceFile(\SYSTEM\SERVERPATH(new \SYSTEM\PSAI(),'modules/saimod_sys_cache/tpl/saimod_sys_cache_entry.tpl'), $r);}
+        return \SYSTEM\PAGE\replace::replaceFile(\SYSTEM\SERVERPATH(new \SYSTEM\PSAI(),'modules/saimod_sys_cache/tpl/saimod_sys_cache.tpl'), $vars);
     }
     
     private static function tablerow_class($cacheID){
         if($cacheID == 1){
             return 'info';}
-            
-        return 'success';                
-    }
+        return 'success';}
     
-    //public static function html_li_menu(){return '<li><a id="menu_cache" href="#!cache">${sai_menu_cache}</a></li>';}
     public static function html_li_menu(){return '<li><a id="menu_cache" data-toggle="tooltip" data-placement="bottom" title="${sai_menu_cache}" href="#!cache"><span class="glyphicon glyphicon-level-up" aria-hidden="true"></span></a></li>';}
     public static function right_public(){return false;}    
     public static function right_right(){return \SYSTEM\SECURITY\Security::check(\SYSTEM\SECURITY\RIGHTS::SYS_SAI);}
diff --git a/sai/modules/saimod_sys_cache/tpl/saimod_sys_cache.tpl b/sai/modules/saimod_sys_cache/tpl/saimod_sys_cache.tpl
new file mode 100644
index 0000000..5044a08
--- /dev/null
+++ b/sai/modules/saimod_sys_cache/tpl/saimod_sys_cache.tpl
@@ -0,0 +1,11 @@
+<h4>System Cache</h4><hr>
+Entries: ${count} showing 100
+<table class="sai_table table table-hover table-condensed" style="overflow: auto;">
+    <tr>
+        <th>ID</th>
+        <th>CacheID</th>
+        <th>Ident</th>
+        <th>Data</th>
+    </tr>
+    ${entries}
+</table>
\ No newline at end of file
diff --git a/sai/modules/saimod_sys_cache/tpl/saimod_sys_cache_entry.tpl b/sai/modules/saimod_sys_cache/tpl/saimod_sys_cache_entry.tpl
new file mode 100644
index 0000000..e4bf11e
--- /dev/null
+++ b/sai/modules/saimod_sys_cache/tpl/saimod_sys_cache_entry.tpl
@@ -0,0 +1,6 @@
+<tr class="${class}">
+    <td>${ID}</td>
+    <td>${CacheID}</td>
+    <td>${Ident}</td>
+    <td><img src="data:image/png;base64,'.${encode}"></td>
+</tr>
\ No newline at end of file