diff --git a/app/basic_operator_panel/index.php b/app/basic_operator_panel/index.php
index e00436ded8..ee0eee9557 100644
--- a/app/basic_operator_panel/index.php
+++ b/app/basic_operator_panel/index.php
@@ -113,10 +113,10 @@
 							//delete extension from the cache
 							$cache = new cache;
 							if (!empty($row['extension'])) {
-								$cache->delete(gethostname().":directory:".$row['extension']."@".$_SESSION['user']['domain_name']);
+								$cache->delete("directory:".$row['extension']."@".$_SESSION['user']['domain_name']);
 							}
 							if (!empty($number_alias)) {
-								$cache->delete(gethostname().":directory:".$row['number_alias']."@".$_SESSION['user']['domain_name']);
+								$cache->delete("directory:".$row['number_alias']."@".$_SESSION['user']['domain_name']);
 							}
 
 							//incrment
@@ -134,10 +134,10 @@
 							//delete extension from the cache
 							$cache = new cache;
 							if (!empty($row['extension'])) {
-								$cache->delete(gethostname().":directory:".$row['extension']."@".$_SESSION['user']['domain_name']);
+								$cache->delete("directory:".$row['extension']."@".$_SESSION['user']['domain_name']);
 							}
 							if (!empty($number_alias)) {
-								$cache->delete(gethostname().":directory:".$row['number_alias']."@".$_SESSION['user']['domain_name']);
+								$cache->delete("directory:".$row['number_alias']."@".$_SESSION['user']['domain_name']);
 							}
 
 							//incrment
@@ -159,11 +159,11 @@
 				//delete extension from the cache
 					$cache = new cache;
 					if (!empty($extension)) {
-						$cache->delete(gethostname().":directory:".$extension."@".$this->domain_name);
-						$cache->delete(gethostname().":directory:".$extension."@".$domain_name);
+						$cache->delete("directory:".$extension."@".$this->domain_name);
+						$cache->delete("directory:".$extension."@".$domain_name);
 					}
 					if (!empty($number_alias)) {
-						$cache->delete(gethostname().":directory:".$number_alias."@".$this->domain_name);
+						$cache->delete("directory:".$number_alias."@".$this->domain_name);
 					}
 			}
 
diff --git a/app/call_forward/call_forward_edit.php b/app/call_forward/call_forward_edit.php
index 2a998fc51f..3189cd3d2c 100644
--- a/app/call_forward/call_forward_edit.php
+++ b/app/call_forward/call_forward_edit.php
@@ -425,9 +425,9 @@
 
 		//clear the cache
 			$cache = new cache;
-			$cache->delete(gethostname().":directory:".$extension."@".$_SESSION['domain_name']);
+			$cache->delete("directory:".$extension."@".$_SESSION['domain_name']);
 			if (!empty($number_alias)) {
-				$cache->delete(gethostname().":directory:".$number_alias."@".$_SESSION['domain_name']);
+				$cache->delete("directory:".$number_alias."@".$_SESSION['domain_name']);
 			}
 
 		//add the message
diff --git a/app/call_forward/resources/classes/call_forward.php b/app/call_forward/resources/classes/call_forward.php
index 2ee41e2ff2..d1a160dec5 100644
--- a/app/call_forward/resources/classes/call_forward.php
+++ b/app/call_forward/resources/classes/call_forward.php
@@ -164,9 +164,9 @@ class call_forward {
 
 		//delete extension from the cache
 		$cache = new cache;
-		$cache->delete(gethostname() . ":directory:" . $this->extension . "@" . $this->domain_name);
+		$cache->delete("directory:" . $this->extension . "@" . $this->domain_name);
 		if (!empty($this->number_alias)) {
-			$cache->delete(gethostname() . ":directory:" . $this->number_alias . "@" . $this->domain_name);
+			$cache->delete("directory:" . $this->number_alias . "@" . $this->domain_name);
 		}
 	}
 
@@ -316,9 +316,9 @@ class call_forward {
 				//clear the cache
 				$cache = new cache;
 				foreach ($extensions as $uuid => $extension) {
-					$cache->delete(gethostname() . ":directory:" . $extension['extension'] . "@" . $_SESSION['domain_name']);
+					$cache->delete("directory:" . $extension['extension'] . "@" . $_SESSION['domain_name']);
 					if ($extension['number_alias'] != '') {
-						$cache->delete(gethostname() . ":directory:" . $extension['number_alias'] . "@" . $_SESSION['domain_name']);
+						$cache->delete("directory:" . $extension['number_alias'] . "@" . $_SESSION['domain_name']);
 					}
 				}
 
diff --git a/app/call_forward/resources/classes/do_not_disturb.php b/app/call_forward/resources/classes/do_not_disturb.php
index da077bf25c..fe1de36741 100644
--- a/app/call_forward/resources/classes/do_not_disturb.php
+++ b/app/call_forward/resources/classes/do_not_disturb.php
@@ -175,9 +175,9 @@
 
 			//delete extension from the cache
 				$cache = new cache;
-				$cache->delete(gethostname().":directory:".$this->extension."@".$this->domain_name);
+				$cache->delete("directory:".$this->extension."@".$this->domain_name);
 				if(!empty($this->number_alias)){
-					$cache->delete(gethostname().":directory:".$this->number_alias."@".$this->domain_name);
+					$cache->delete("directory:".$this->number_alias."@".$this->domain_name);
 				}
 
 		} //function
@@ -317,9 +317,9 @@
 								//clear the cache
 									$cache = new cache;
 									foreach ($extensions as $uuid => $extension) {
-										$cache->delete(gethostname().":directory:".$extension['extension']."@".$_SESSION['domain_name']);
+										$cache->delete("directory:".$extension['extension']."@".$_SESSION['domain_name']);
 										if ($extension['number_alias'] != '') {
-											$cache->delete(gethostname().":directory:".$extension['number_alias']."@".$_SESSION['domain_name']);
+											$cache->delete("directory:".$extension['number_alias']."@".$_SESSION['domain_name']);
 										}
 									}
 
diff --git a/app/call_forward/resources/classes/follow_me.php b/app/call_forward/resources/classes/follow_me.php
index 4ca203475e..08d14eac82 100644
--- a/app/call_forward/resources/classes/follow_me.php
+++ b/app/call_forward/resources/classes/follow_me.php
@@ -459,9 +459,9 @@
 								//clear the cache
 									$cache = new cache;
 									foreach ($extensions as $uuid => $extension) {
-										$cache->delete(gethostname().":directory:".$extension['extension']."@".$_SESSION['domain_name']);
+										$cache->delete("directory:".$extension['extension']."@".$_SESSION['domain_name']);
 										if ($extension['number_alias'] != '') {
-											$cache->delete(gethostname().":directory:".$extension['number_alias']."@".$_SESSION['domain_name']);
+											$cache->delete("directory:".$extension['number_alias']."@".$_SESSION['domain_name']);
 										}
 									}
 
diff --git a/app/extension_settings/extension_setting_edit.php b/app/extension_settings/extension_setting_edit.php
index 16b6c63605..2270b84e1d 100644
--- a/app/extension_settings/extension_setting_edit.php
+++ b/app/extension_settings/extension_setting_edit.php
@@ -157,8 +157,8 @@
 			$parameters['extension_uuid'] = $extension_uuid;
 			$extension = $database->select($sql, $parameters, 'row');
 			$cache = new cache;
-			$cache->delete(gethostname().":directory:".$extension["extension"]."@".$extension["user_context"]);
-			$cache->delete(gethostname().":directory:".$extension["number_alias"]."@".$extension["user_context"]);
+			$cache->delete("directory:".$extension["extension"]."@".$extension["user_context"]);
+			$cache->delete("directory:".$extension["number_alias"]."@".$extension["user_context"]);
 
 		//redirect the user
 			if (isset($action)) {
diff --git a/app/extension_settings/resources/classes/extension_settings.php b/app/extension_settings/resources/classes/extension_settings.php
index 5f40db66a4..997b3e0abd 100644
--- a/app/extension_settings/resources/classes/extension_settings.php
+++ b/app/extension_settings/resources/classes/extension_settings.php
@@ -172,8 +172,8 @@ class extension_settings {
 						$parameters['extension_uuid'] = $this->extension_uuid;
 						$extension                    = $this->database->select($sql, $parameters, 'row');
 						$cache                        = new cache;
-						$cache->delete(gethostname() . ":directory:" . $extension["extension"] . "@" . $extension["user_context"]);
-						$cache->delete(gethostname() . ":directory:" . $extension["number_alias"] . "@" . $extension["user_context"]);
+						$cache->delete("directory:" . $extension["extension"] . "@" . $extension["user_context"]);
+						$cache->delete("directory:" . $extension["number_alias"] . "@" . $extension["user_context"]);
 					}
 
 					//set message
@@ -255,8 +255,8 @@ class extension_settings {
 					$parameters['extension_uuid'] = $this->extension_uuid;
 					$extension                    = $this->database->select($sql, $parameters, 'row');
 					$cache                        = new cache;
-					$cache->delete(gethostname() . ":directory:" . $extension["extension"] . "@" . $extension["user_context"]);
-					$cache->delete(gethostname() . ":directory:" . $extension["number_alias"] . "@" . $extension["user_context"]);
+					$cache->delete("directory:" . $extension["extension"] . "@" . $extension["user_context"]);
+					$cache->delete("directory:" . $extension["number_alias"] . "@" . $extension["user_context"]);
 
 					//set message
 					message::add($text['message-toggle']);
diff --git a/app/extensions/extension_edit.php b/app/extensions/extension_edit.php
index dda3103fee..db4f30d3b8 100644
--- a/app/extensions/extension_edit.php
+++ b/app/extensions/extension_edit.php
@@ -903,9 +903,9 @@
 								$user_context = $database->select($sql, $parameters, 'column');
 							}
 							$cache = new cache;
-							$cache->delete(gethostname().":directory:".$extension."@".$user_context);
+							$cache->delete("directory:".$extension."@".$user_context);
 							if (permission_exists('number_alias') && !empty($number_alias)) {
-								$cache->delete(gethostname().":directory:".$number_alias."@".$user_context);
+								$cache->delete("directory:".$number_alias."@".$user_context);
 							}
 
 						//clear the destinations session array
diff --git a/app/extensions/resources/classes/extension.php b/app/extensions/resources/classes/extension.php
index 80bb722df3..68b85c8af1 100644
--- a/app/extensions/resources/classes/extension.php
+++ b/app/extensions/resources/classes/extension.php
@@ -742,9 +742,9 @@ class extension {
 					//clear the cache
 					foreach ($extensions as $x => $extension) {
 						$cache = new cache;
-						$cache->delete(gethostname() . ":directory:" . $extension['extension'] . "@" . $extension['user_context']);
+						$cache->delete("directory:" . $extension['extension'] . "@" . $extension['user_context']);
 						if (permission_exists('number_alias') && !empty($extension['number_alias'])) {
-							$cache->delete(gethostname() . ":directory:" . $extension['number_alias'] . "@" . $extension['user_context']);
+							$cache->delete("directory:" . $extension['number_alias'] . "@" . $extension['user_context']);
 						}
 					}
 					unset($extensions);
@@ -859,9 +859,9 @@ class extension {
 					//clear the cache
 					foreach ($extensions as $uuid => $extension) {
 						$cache = new cache;
-						$cache->delete(gethostname() . ":directory:" . $extension['extension'] . "@" . $extension['user_context']);
+						$cache->delete("directory:" . $extension['extension'] . "@" . $extension['user_context']);
 						if (permission_exists('number_alias') && !empty($extension['number_alias'])) {
-							$cache->delete(gethostname() . ":directory:" . $extension['number_alias'] . "@" . $extension['user_context']);
+							$cache->delete("directory:" . $extension['number_alias'] . "@" . $extension['user_context']);
 						}
 					}
 					unset($extensions);
diff --git a/app/extensions/resources/dashboard/caller_id.php b/app/extensions/resources/dashboard/caller_id.php
index b6a4f46114..08ef0c6b35 100644
--- a/app/extensions/resources/dashboard/caller_id.php
+++ b/app/extensions/resources/dashboard/caller_id.php
@@ -117,7 +117,7 @@
 				//clear the cache
 					$cache = new cache;
 					foreach($_SESSION['user']['extension'] as $field) {
-						$cache->delete(gethostname().":directory:".$field['destination']."@".$field['user_context']);
+						$cache->delete("directory:".$field['destination']."@".$field['user_context']);
 					}
 
 				//set the message
diff --git a/app/switch/resources/scripts/app/feature_event/index.lua b/app/switch/resources/scripts/app/feature_event/index.lua
index 1d2d2ed2bd..489bbd70c5 100644
--- a/app/switch/resources/scripts/app/feature_event/index.lua
+++ b/app/switch/resources/scripts/app/feature_event/index.lua
@@ -358,5 +358,5 @@
 	end
 	--clear the cache
 		if (feature_enabled ~= nil) then
-			cache.del(hostname..":directory:"..user.."@"..host)
+			cache.del("directory:"..user.."@"..host)
 		end
diff --git a/app/switch/resources/scripts/app/xml_handler/resources/scripts/directory/directory.lua b/app/switch/resources/scripts/app/xml_handler/resources/scripts/directory/directory.lua
index 7939714ff7..0583635d36 100644
--- a/app/switch/resources/scripts/app/xml_handler/resources/scripts/directory/directory.lua
+++ b/app/switch/resources/scripts/app/xml_handler/resources/scripts/directory/directory.lua
@@ -161,7 +161,7 @@
 		-- or we do not need dial-string. In other way we have to use database.
 			if (continue) and (not USE_FS_PATH) then
 				if (cache.support() and domain_name) then
-					local cache_key, err = hostname .. ":directory:" .. (from_user or user) .. "@" .. domain_name
+					local cache_key, err = "directory:" .. (from_user or user) .. "@" .. domain_name
 					XML_STRING, err = cache.get(cache_key);
 
 					if debug['cache'] then
@@ -774,7 +774,7 @@
 
 						--set the cache
 							if cache.support() then
-								local cache_key = hostname .. ":directory:" .. sip_from_number .. "@" .. domain_name
+								local cache_key = "directory:" .. sip_from_number .. "@" .. domain_name
 								if debug['cache'] then
 									freeswitch.consoleLog("notice", "[xml_handler][directory][cache] set key: " .. cache_key .. "\n")
 								end
@@ -784,7 +784,7 @@
 								end
 
 								if sip_from_number ~= sip_from_user then
-									cache_key = hostname .. ":directory:" .. sip_from_user .. "@" .. domain_name
+									cache_key = "directory:" .. sip_from_user .. "@" .. domain_name
 									if debug['cache'] then
 										freeswitch.consoleLog("notice", "[xml_handler][directory][cache] set key: " .. cache_key .. "\n")
 									end
diff --git a/app/switch/resources/scripts/call_forward.lua b/app/switch/resources/scripts/call_forward.lua
index b3099ff4bd..cb6edddd8f 100644
--- a/app/switch/resources/scripts/call_forward.lua
+++ b/app/switch/resources/scripts/call_forward.lua
@@ -308,9 +308,9 @@
 
 --clear the cache
 	if extension and #extension > 0 and cache.support() then
-		cache.del(hostname..":directory:"..extension.."@"..domain_name);
+		cache.del("directory:"..extension.."@"..domain_name);
 		if #number_alias > 0 then
-			cache.del(hostname..":directory:"..number_alias.."@"..domain_name);
+			cache.del("directory:"..number_alias.."@"..domain_name);
 		end
 	end
 
diff --git a/app/switch/resources/scripts/dial_string.lua b/app/switch/resources/scripts/dial_string.lua
index 6de3128ea4..a4f6184f59 100644
--- a/app/switch/resources/scripts/dial_string.lua
+++ b/app/switch/resources/scripts/dial_string.lua
@@ -235,17 +235,17 @@ if ( session:ready() ) then
 	--clear the cache
 		if (user_name ~= nil and context ~= nil) then
 			if (cache.support()) then
-				cache.del(hostname..":directory:"..user_name.."@"..context);
+				cache.del("directory:"..user_name.."@"..context);
 				if #number_alias > 0 then
-					cache.del(hostname..":directory:"..number_alias.."@"..domain_name);
+					cache.del("directory:"..number_alias.."@"..domain_name);
 				end
 			end
 		end
 		if (db_extension ~= nil and context ~= nil) then
 			if (cache.support()) then
-				cache.del(hostname..":directory:"..db_extension.."@"..context);
+				cache.del("directory:"..db_extension.."@"..context);
 				if #number_alias > 0 then
-					cache.del(hostname..":directory:"..number_alias.."@"..domain_name);
+					cache.del("directory:"..number_alias.."@"..domain_name);
 				end
 			end
 		end
diff --git a/app/switch/resources/scripts/do_not_disturb.lua b/app/switch/resources/scripts/do_not_disturb.lua
index 1ee42dd925..fecb541d50 100644
--- a/app/switch/resources/scripts/do_not_disturb.lua
+++ b/app/switch/resources/scripts/do_not_disturb.lua
@@ -265,9 +265,9 @@
 
 --clear the cache
 	if extension and #extension > 0 and cache.support() then
-		cache.del(hostname..":directory:"..extension.."@"..context);
+		cache.del("directory:"..extension.."@"..context);
 		if #number_alias > 0 then
-			cache.del(hostname..":directory:"..number_alias.."@"..context);
+			cache.del("directory:"..number_alias.."@"..context);
 		end
 	end
 
diff --git a/app/switch/resources/scripts/follow_me.lua b/app/switch/resources/scripts/follow_me.lua
index deadaa086d..776c34390a 100644
--- a/app/switch/resources/scripts/follow_me.lua
+++ b/app/switch/resources/scripts/follow_me.lua
@@ -137,9 +137,9 @@
 
 --clear the cache
 	if (extension ~= nil) and cache.support() then
-		cache.del(hostname..":directory:"..extension.."@"..domain_name);
+		cache.del("directory:"..extension.."@"..domain_name);
 		if #number_alias > 0 then
-			cache.del(hostname..":directory:"..number_alias.."@"..domain_name);
+			cache.del("directory:"..number_alias.."@"..domain_name);
 		end
 	end