Index: branches/5.3.x/core/install/cache/class_structure.php
===================================================================
diff -u -N -r16727 -r16731
--- branches/5.3.x/core/install/cache/class_structure.php	(.../class_structure.php)	(revision 16727)
+++ branches/5.3.x/core/install/cache/class_structure.php	(.../class_structure.php)	(revision 16731)
@@ -38,6 +38,7 @@
 		'ConfigurationValidator' => '/core/units/configuration/configuration_validator.php',
 		'ContentEventHandler' => '/core/units/content/content_eh.php',
 		'ContentTagProcessor' => '/core/units/content/content_tp.php',
+		'CookieManager' => '/core/kernel/managers/cookie_manager.php',
 		'CoreUpgrades' => '/core/install/upgrades.php',
 		'CountryStateEventHandler' => '/core/units/country_states/country_state_eh.php',
 		'CssMinifyHelper' => '/core/units/helpers/minifiers/css_minify_helper.php',
@@ -252,7 +253,6 @@
 		'kChartHelper' => '/core/units/helpers/chart_helper.php',
 		'kClipboardHelper' => '/core/units/helpers/clipboard_helper.php',
 		'kColumnPickerHelper' => '/core/units/helpers/col_picker_helper.php',
-		'kCookieHasher' => '/core/kernel/utility/cookie_hasher.php',
 		'kCountHelper' => '/core/units/helpers/count_helper.php',
 		'kCountryStatesHelper' => '/core/units/helpers/country_states_helper.php',
 		'kCronField' => '/core/units/helpers/cron_helper.php',
@@ -565,6 +565,13 @@
 				0 => 'kDBTagProcessor',
 			),
 		),
+		'CookieManager' => array(
+			'type' => 1,
+			'modifiers' => 2,
+			'extends' => array(
+				0 => 'kBase',
+			),
+		),
 		'CoreUpgrades' => array(
 			'type' => 1,
 			'modifiers' => 0,
@@ -1967,13 +1974,6 @@
 				0 => 'kHelper',
 			),
 		),
-		'kCookieHasher' => array(
-			'type' => 1,
-			'modifiers' => 0,
-			'extends' => array(
-				0 => 'kBase',
-			),
-		),
 		'kCountHelper' => array(
 			'type' => 1,
 			'modifiers' => 0,