Index: branches/5.1.x/core/kernel/utility/cache.php
===================================================================
diff -u -N -r13180 -r13905
--- branches/5.1.x/core/kernel/utility/cache.php	(.../cache.php)	(revision 13180)
+++ branches/5.1.x/core/kernel/utility/cache.php	(.../cache.php)	(revision 13905)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: cache.php 13180 2010-03-03 19:23:27Z alex $
+* @version	$Id: cache.php 13905 2010-08-29 10:36:55Z alex $
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
@@ -213,10 +213,6 @@
 		 */
 		function prepareKeyName($name, $replace_serials = true)
 		{
-			if ($this->cachingType == CACHING_TYPE_TEMPORARY) {
-				return $name;
-			}
-
 			// replace serials in key name
 			if ($replace_serials && preg_match_all('/\[%(.*?)%\]/', $name, $regs)) {
 				// [%LangSerial%] - prefix-wide serial in case of any change in "lang" prefix
@@ -227,6 +223,10 @@
 				}
 			}
 
+			if ($this->cachingType == CACHING_TYPE_TEMPORARY) {
+				return $name;
+			}
+
 			// add site-wide prefix to key
 			return $this->_cachePrefix() . $name;
 		}
Index: branches/5.1.x/core/kernel/application.php
===================================================================
diff -u -N -r13874 -r13905
--- branches/5.1.x/core/kernel/application.php	(.../application.php)	(revision 13874)
+++ branches/5.1.x/core/kernel/application.php	(.../application.php)	(revision 13905)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: application.php 13874 2010-08-28 20:39:56Z alex $
+* @version	$Id: application.php 13905 2010-08-29 10:36:55Z alex $
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
@@ -829,14 +829,12 @@
 		$serial_name = $pascal_case_prefix . (isset($id) ? 'IDSerial:' . $id : 'Serial');
 
 		if ($increment) {
-			if ($this->isCachingType(CACHING_TYPE_MEMORY)) {
-				if (defined('DEBUG_MODE') && DEBUG_MODE && $this->isDebugMode()) {
-					$this->Application->Debugger->appendHTML('Incrementing serial: <strong>' . $serial_name . '</strong>.');
-				}
-
-				$this->setCache($serial_name, (int)$this->getCache($serial_name) + 1);
+			if (defined('DEBUG_MODE') && DEBUG_MODE && $this->isDebugMode()) {
+				$this->Application->Debugger->appendHTML('Incrementing serial: <strong>' . $serial_name . '</strong>.');
 			}
 
+			$this->setCache($serial_name, (int)$this->getCache($serial_name) + 1);
+
 			if (!defined('IS_INSTALL') || !IS_INSTALL) {
 				// delete cached mod-rewrite urls related to given prefix and id
 				$delete_clause = isset($id) ? $prefix . ':' . $id : $prefix;