Index: branches/5.3.x/core/kernel/utility/unit_config_reader.php
===================================================================
diff -u -N -r16177 -r16178
--- branches/5.3.x/core/kernel/utility/unit_config_reader.php	(.../unit_config_reader.php)	(revision 16177)
+++ branches/5.3.x/core/kernel/utility/unit_config_reader.php	(.../unit_config_reader.php)	(revision 16178)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: unit_config_reader.php 16177 2015-05-13 19:27:57Z alex $
+* @version	$Id: unit_config_reader.php 16178 2015-05-13 19:36:51Z alex $
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
@@ -302,7 +302,7 @@
 	 *
 	 * @return array
 	 */
-	protected function getUnitConfigsWithoutPriority()
+	public function getUnitConfigsWithoutPriority()
 	{
 		$ret = array();
 
@@ -320,7 +320,7 @@
 	 *
 	 * @return array
 	 */
-	protected function getUnitConfigsWithPriority()
+	public function getUnitConfigsWithPriority()
 	{
 		$ret = array();
 
@@ -440,6 +440,11 @@
 	 */
 	public function ReReadConfigs()
 	{
+		if ( $this->storeCache && $this->finalStage ) {
+			// Building cache right now, so all unit configs are read anyway.
+			return;
+		}
+
 		// don't reset prefix file, since file scanning could slow down the process
 		$prefix_files_backup = $this->prefixFiles;
 		$this->Application->cacheManager->EmptyUnitCache();