diff --git a/misuzu.php b/misuzu.php
index 51ebc8b..62a3ef0 100644
--- a/misuzu.php
+++ b/misuzu.php
@@ -1,7 +1,6 @@
 <?php
 namespace Misuzu;
 
-use PDO;
 use Index\Autoloader;
 use Index\Environment;
 use Index\Data\ConnectionFailedException;
@@ -143,7 +142,11 @@ if(!is_readable(MSZ_STORAGE) || !is_writable(MSZ_STORAGE)) {
 GeoIP::init($cfg->getValue('geoip.database', CfgType::T_STR, '/var/lib/GeoIP/GeoLite2-Country.mmdb'));
 
 if(!MSZ_DEBUG) {
-    $twigCache = sys_get_temp_dir() . '/msz-tpl-cache-' . md5(MSZ_ROOT);
+    $twigCacheDirSfx = GitInfo::hash(true);
+    if(empty($twigCacheDirSfx))
+        $twigCacheDirSfx = md5(MSZ_ROOT);
+
+    $twigCache = sys_get_temp_dir() . '/msz-tpl-' . $twigCacheDirSfx;
     if(!is_dir($twigCache))
         mkdir($twigCache, 0775, true);
 }
diff --git a/src/MszContext.php b/src/MszContext.php
index 85e6ad8..dcb318a 100644
--- a/src/MszContext.php
+++ b/src/MszContext.php
@@ -1,8 +1,8 @@
 <?php
 namespace Misuzu;
 
-use Misuzu\Config\IConfig;
 use Misuzu\Template;
+use Misuzu\Config\IConfig;
 use Misuzu\SharpChat\SharpChatRoutes;
 use Misuzu\Users\Users;
 use Index\Data\IDbConnection;