diff --git a/public/include/pages/admin/transactions.inc.php b/public/include/pages/admin/transactions.inc.php
index b25d6f15..fe991ba5 100644
--- a/public/include/pages/admin/transactions.inc.php
+++ b/public/include/pages/admin/transactions.inc.php
@@ -9,7 +9,7 @@ if (!$user->isAuthenticated() || !$user->isAdmin($_SESSION['USERDATA']['id'])) {
   die("404 Page not found");
 }
 
-if (!$smarty->isCached('master.tpl', md5(serialize($_REQUEST)))) {
+if (!$smarty->isCached('master.tpl', $smarty_cache_key)) {
   $debug->append('No cached version available, fetching from backend', 3);
   $aTransactions = $transaction->getAllTransactions(@$_REQUEST['start']);
   if (!$aTransactions) $_SESSION['POPUP'][] = array('CONTENT' => 'Could not find any transaction', 'TYPE' => 'errormsg');
diff --git a/public/include/pages/admin/wallet.inc.php b/public/include/pages/admin/wallet.inc.php
index d0642b14..fee0fd16 100644
--- a/public/include/pages/admin/wallet.inc.php
+++ b/public/include/pages/admin/wallet.inc.php
@@ -9,7 +9,7 @@ if (!$user->isAuthenticated() || !$user->isAdmin($_SESSION['USERDATA']['id'])) {
   die("404 Page not found");
 }
 
-if (!$smarty->isCached('master.tpl', md5(serialize($_REQUEST)))) {
+if (!$smarty->isCached('master.tpl', $smarty_cache_key)) {
   $debug->append('No cached version available, fetching from backend', 3);
   if ($bitcoin->can_connect() === true){
     $dBalance = $bitcoin->query('getbalance');
diff --git a/public/include/pages/home.inc.php b/public/include/pages/home.inc.php
index 9431e219..349b197d 100644
--- a/public/include/pages/home.inc.php
+++ b/public/include/pages/home.inc.php
@@ -6,7 +6,7 @@ if (!defined('SECURITY')) die('Hacking attempt');
 // Include markdown library
 use \Michelf\Markdown;
 
-if (!$smarty->isCached('master.tpl', md5(serialize($_REQUEST)))) {
+if (!$smarty->isCached('master.tpl', $smarty_cache_key)) {
   $debug->append('No cached version available, fetching from backend', 3);
   // Fetch active news to display
   $aNews = $news->getAllActive();
diff --git a/public/include/pages/statistics.inc.php b/public/include/pages/statistics.inc.php
index c5035f0c..076ce66f 100644
--- a/public/include/pages/statistics.inc.php
+++ b/public/include/pages/statistics.inc.php
@@ -4,7 +4,7 @@
 if (!defined('SECURITY'))
     die('Hacking attempt');
 
-if (!$smarty->isCached('master.tpl', md5(serialize($_REQUEST)))) {
+if (!$smarty->isCached('master.tpl', $smarty_cache_key)) {
   $debug->append('No cached version available, fetching from backend', 3);
   if ($bitcoin->can_connect() === true){
     $dDifficulty = $bitcoin->query('getdifficulty');
diff --git a/public/include/pages/statistics/blocks.inc.php b/public/include/pages/statistics/blocks.inc.php
index 98d5ed04..3218a9f4 100644
--- a/public/include/pages/statistics/blocks.inc.php
+++ b/public/include/pages/statistics/blocks.inc.php
@@ -4,7 +4,7 @@
 if (!defined('SECURITY')) die('Hacking attempt');
 
 // Grab the last blocks found
-if (!$smarty->isCached('master.tpl', md5(serialize($_REQUEST)))) {
+if (!$smarty->isCached('master.tpl', $smarty_cache_key)) {
   $debug->append('No cached version available, fetching from backend', 3);
   // Grab the last blocks found
   $iLimit = 20;
diff --git a/public/include/pages/statistics/graphs.inc.php b/public/include/pages/statistics/graphs.inc.php
index 4d31aadb..575ce36d 100644
--- a/public/include/pages/statistics/graphs.inc.php
+++ b/public/include/pages/statistics/graphs.inc.php
@@ -3,7 +3,7 @@
 // Make sure we are called from index.php
 if (!defined('SECURITY')) die('Hacking attempt');
 
-if (!$smarty->isCached('master.tpl', md5(serialize($_REQUEST)))) {
+if (!$smarty->isCached('master.tpl', $smarty_cache_key)) {
   $debug->append('No cached version available, fetching from backend', 3);
   if ($user->isAuthenticated()) {
     $aHourlyHashRates = $statistics->getHourlyHashrateByAccount($_SESSION['USERDATA']['id']);
diff --git a/public/include/pages/statistics/pool.inc.php b/public/include/pages/statistics/pool.inc.php
index 8386cb07..f3669625 100644
--- a/public/include/pages/statistics/pool.inc.php
+++ b/public/include/pages/statistics/pool.inc.php
@@ -3,7 +3,7 @@
 // Make sure we are called from index.php
 if (!defined('SECURITY')) die('Hacking attempt');
 
-if (!$smarty->isCached('master.tpl', md5(serialize($_REQUEST)))) {
+if (!$smarty->isCached('master.tpl', $smarty_cache_key)) {
   $debug->append('No cached version available, fetching from backend', 3);
   // Fetch data from wallet
   if ($bitcoin->can_connect() === true){
diff --git a/public/include/smarty.inc.php b/public/include/smarty.inc.php
index e42e56e3..f95180d7 100644
--- a/public/include/smarty.inc.php
+++ b/public/include/smarty.inc.php
@@ -25,5 +25,7 @@ if ($config['smarty']['cache']) {
   $smarty->setCaching(Smarty::CACHING_LIFETIME_SAVED);
   $smarty->cache_lifetime = $config['smarty']['cache_lifetime'];
   $smarty->cache_dir = BASEPATH . "templates/cache";
+  $smarty->use_sub_dirs = true;
+  $smarty_cache_key = md5(serialize($_REQUEST) . serialize(@$_SESSION['USERDATA']['id']));
 }
 ?>
diff --git a/public/index.php b/public/index.php
index dbb28f9a..36360172 100644
--- a/public/index.php
+++ b/public/index.php
@@ -82,7 +82,7 @@ $smarty->assign('DebuggerInfo', $debug->getDebugInfo());
 
 // Display our page
 if (!@$supress_master)
-  $smarty->display("master.tpl", md5(serialize($_REQUEST)));
+  $smarty->display("master.tpl", $smarty_cache_key);
 
 // Unset any temporary values here
 unset($_SESSION['POPUP']);