diff --git a/app/access_controls/app_defaults.php b/app/access_controls/app_defaults.php
index 03062004ff..c11175c83a 100644
--- a/app/access_controls/app_defaults.php
+++ b/app/access_controls/app_defaults.php
@@ -144,7 +144,7 @@
 			//clear the cache
 			$cache = new cache;
 			$cache->delete("configuration:acl.conf");
-			$cache->delete("configuration:sofia.conf:".gethostname());
+			$cache->delete(gethostname().":configuration:sofia.conf");
 
 			//create the event socket connection
 			$esl = event_socket::create();
diff --git a/app/basic_operator_panel/index.php b/app/basic_operator_panel/index.php
index de7a4e3ea9..19c488d109 100644
--- a/app/basic_operator_panel/index.php
+++ b/app/basic_operator_panel/index.php
@@ -116,10 +116,10 @@
 							//delete extension from the cache
 							$cache = new cache;
 							if (!empty($row['extension'])) {
-								$cache->delete("directory:".$row['extension']."@".$_SESSION['user']['domain_name']);
+								$cache->delete(gethostname().":directory:".$row['extension']."@".$_SESSION['user']['domain_name']);
 							}
 							if (!empty($number_alias)) {
-								$cache->delete("directory:".$row['number_alias']."@".$_SESSION['user']['domain_name']);
+								$cache->delete(gethostname().":directory:".$row['number_alias']."@".$_SESSION['user']['domain_name']);
 							}
 
 							//incrment
@@ -137,10 +137,10 @@
 							//delete extension from the cache
 							$cache = new cache;
 							if (!empty($row['extension'])) {
-								$cache->delete("directory:".$row['extension']."@".$_SESSION['user']['domain_name']);
+								$cache->delete(gethostname().":directory:".$row['extension']."@".$_SESSION['user']['domain_name']);
 							}
 							if (!empty($number_alias)) {
-								$cache->delete("directory:".$row['number_alias']."@".$_SESSION['user']['domain_name']);
+								$cache->delete(gethostname().":directory:".$row['number_alias']."@".$_SESSION['user']['domain_name']);
 							}
 
 							//incrment
@@ -162,10 +162,11 @@
 				//delete extension from the cache
 					$cache = new cache;
 					if (!empty($extension)) {
+						$cache->delete(gethostname().":directory:".$extension."@".$this->domain_name);
 						$cache->delete("directory:".$extension."@".$domain_name);
 					}
 					if (!empty($number_alias)) {
-						$cache->delete("directory:".$number_alias."@".$domain_name);
+						$cache->delete(gethostname().":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 4744abd8da..c6539e9a92 100644
--- a/app/call_forward/call_forward_edit.php
+++ b/app/call_forward/call_forward_edit.php
@@ -419,9 +419,9 @@
 
 		//clear the cache
 			$cache = new cache;
-			$cache->delete("directory:".$extension."@".$_SESSION['domain_name']);
+			$cache->delete(gethostname().":directory:".$extension."@".$_SESSION['domain_name']);
 			if (!empty($number_alias)) {
-				$cache->delete("directory:".$number_alias."@".$_SESSION['domain_name']);
+				$cache->delete(gethostname().":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 03ccc168ef..a2b6b2d9d2 100644
--- a/app/call_forward/resources/classes/call_forward.php
+++ b/app/call_forward/resources/classes/call_forward.php
@@ -144,9 +144,9 @@
 
 			//delete extension from the cache
 			$cache = new cache;
-			$cache->delete("directory:" . $this->extension . "@" . $this->domain_name);
+			$cache->delete(gethostname().":directory:" . $this->extension . "@" . $this->domain_name);
 			if (!empty($this->number_alias)) {
-				$cache->delete("directory:" . $this->number_alias . "@" . $this->domain_name);
+				$cache->delete(gethostname().":directory:" . $this->number_alias . "@" . $this->domain_name);
 			}
 		}
 
@@ -291,9 +291,9 @@
 					//clear the cache
 					$cache = new cache;
 					foreach ($extensions as $uuid => $extension) {
-						$cache->delete("directory:" . $extension['extension'] . "@" . $this->domain_name);
+						$cache->delete(gethostname().":directory:" . $extension['extension'] . "@" . $_SESSION['domain_name']);
 						if ($extension['number_alias'] != '') {
-							$cache->delete("directory:" . $extension['number_alias'] . "@" . $this->domain_name);
+							$cache->delete(gethostname().":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 0098f3dcbb..c62c220cb7 100644
--- a/app/call_forward/resources/classes/do_not_disturb.php
+++ b/app/call_forward/resources/classes/do_not_disturb.php
@@ -174,9 +174,9 @@
 
 			//delete extension from the cache
 				$cache = new cache;
-				$cache->delete("directory:".$this->extension."@".$this->domain_name);
+				$cache->delete(gethostname().":directory:".$this->extension."@".$this->domain_name);
 				if(!empty($this->number_alias)){
-					$cache->delete("directory:".$this->number_alias."@".$this->domain_name);
+					$cache->delete(gethostname().":directory:".$this->number_alias."@".$this->domain_name);
 				}
 
 		} //function
@@ -316,9 +316,9 @@
 								//clear the cache
 									$cache = new cache;
 									foreach ($extensions as $uuid => $extension) {
-										$cache->delete("directory:".$extension['extension']."@".$this->domain_name);
+										$cache->delete(gethostname().":directory:".$extension['extension']."@".$_SESSION['domain_name']);
 										if ($extension['number_alias'] != '') {
-											$cache->delete("directory:".$extension['number_alias']."@".$this->domain_name);
+											$cache->delete(gethostname().":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 1a7f751a86..348f00057f 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("directory:".$extension['extension']."@".$this->domain_name);
+										$cache->delete(gethostname().":directory:".$extension['extension']."@".$_SESSION['domain_name']);
 										if ($extension['number_alias'] != '') {
-											$cache->delete("directory:".$extension['number_alias']."@".$this->domain_name);
+											$cache->delete(gethostname().":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 a10bbfc29a..264f22a090 100644
--- a/app/extension_settings/extension_setting_edit.php
+++ b/app/extension_settings/extension_setting_edit.php
@@ -160,8 +160,8 @@
 			$parameters['extension_uuid'] = $extension_uuid;
 			$extension = $database->select($sql, $parameters, 'row');
 			$cache = new cache;
-			$cache->delete("directory:".$extension["extension"]."@".$extension["user_context"]);
-			$cache->delete("directory:".$extension["number_alias"]."@".$extension["user_context"]);
+			$cache->delete(gethostname().":directory:".$extension["extension"]."@".$extension["user_context"]);
+			$cache->delete(gethostname().":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 54abd32353..4710c66a55 100644
--- a/app/extension_settings/resources/classes/extension_settings.php
+++ b/app/extension_settings/resources/classes/extension_settings.php
@@ -135,8 +135,8 @@
 									$parameters['extension_uuid'] = $this->extension_uuid;
 									$extension = $this->database->select($sql, $parameters, 'row');
 									$cache = new cache;
-									$cache->delete("directory:".$extension["extension"]."@".$extension["user_context"]);
-									$cache->delete("directory:".$extension["number_alias"]."@".$extension["user_context"]);
+									$cache->delete(gethostname().":directory:".$extension["extension"]."@".$extension["user_context"]);
+									$cache->delete(gethostname().":directory:".$extension["number_alias"]."@".$extension["user_context"]);
 
 								//set message
 									message::add($text['message-delete']);
@@ -211,8 +211,8 @@
 									$parameters['extension_uuid'] = $extension_uuid;
 									$extension = $this->database->select($sql, $parameters, 'row');
 									$cache = new cache;
-									$cache->delete("directory:".$extension["extension"]."@".$extension["user_context"]);
-									$cache->delete("directory:".$extension["number_alias"]."@".$extension["user_context"]);
+									$cache->delete(gethostname().":directory:".$extension["extension"]."@".$extension["user_context"]);
+									$cache->delete(gethostname().":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 0977f2caab..8d87d6980f 100644
--- a/app/extensions/extension_edit.php
+++ b/app/extensions/extension_edit.php
@@ -862,9 +862,9 @@
 								$user_context = $database->select($sql, $parameters, 'column');
 							}
 							$cache = new cache;
-							$cache->delete("directory:".$extension."@".$user_context);
+							$cache->delete(gethostname().":directory:".$extension."@".$user_context);
 							if (permission_exists('number_alias') && !empty($number_alias)) {
-								$cache->delete("directory:".$number_alias."@".$user_context);
+								$cache->delete(gethostname().":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 1432182a56..a86e051409 100644
--- a/app/extensions/resources/classes/extension.php
+++ b/app/extensions/resources/classes/extension.php
@@ -696,9 +696,9 @@
 								//clear the cache
 									foreach ($extensions as $x => $extension) {
 										$cache = new cache;
-										$cache->delete("directory:".$extension['extension']."@".$extension['user_context']);
+										$cache->delete(gethostname().":directory:".$extension['extension']."@".$extension['user_context']);
 										if (permission_exists('number_alias') && !empty($extension['number_alias'])) {
-											$cache->delete("directory:".$extension['number_alias']."@".$extension['user_context']);
+											$cache->delete(gethostname().":directory:".$extension['number_alias']."@".$extension['user_context']);
 										}
 									}
 									unset($extensions);
@@ -807,9 +807,9 @@
 								//clear the cache
 									foreach ($extensions as $uuid => $extension) {
 										$cache = new cache;
-										$cache->delete("directory:".$extension['extension']."@".$extension['user_context']);
+										$cache->delete(gethostname().":directory:".$extension['extension']."@".$extension['user_context']);
 										if (permission_exists('number_alias') && !empty($extension['number_alias'])) {
-											$cache->delete("directory:".$extension['number_alias']."@".$extension['user_context']);
+											$cache->delete(gethostname().":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 5dc673b227..0e3eff60ce 100644
--- a/app/extensions/resources/dashboard/caller_id.php
+++ b/app/extensions/resources/dashboard/caller_id.php
@@ -111,7 +111,7 @@
 				//clear the cache
 					$cache = new cache;
 					foreach($_SESSION['user']['extension'] as $field) {
-						$cache->delete("directory:".$field['destination']."@".$field['user_context']);
+						$cache->delete(gethostname().":directory:".$field['destination']."@".$field['user_context']);
 					}
 
 				//set the message
diff --git a/app/gateways/gateway_copy.php b/app/gateways/gateway_copy.php
index 11eaf70de6..dd617d3f47 100644
--- a/app/gateways/gateway_copy.php
+++ b/app/gateways/gateway_copy.php
@@ -145,10 +145,8 @@
 			save_gateway_xml();
 
 		//clear the cache
-			$esl = event_socket::create();
-			$hostname = trim(event_socket::api('switchname'));
 			$cache = new cache;
-			$cache->delete("configuration:sofia.conf:".$hostname);
+			$cache->delete(gethostname().":configuration:sofia.conf");
 
 		//set message
 			message::add($text['message-copy']);
diff --git a/app/gateways/gateway_edit.php b/app/gateways/gateway_edit.php
index fd38c6eea4..36567b8a90 100644
--- a/app/gateways/gateway_edit.php
+++ b/app/gateways/gateway_edit.php
@@ -223,10 +223,8 @@
 					save_gateway_xml();
 
 				//clear the cache
-					$esl = event_socket::create();
-					$hostname = trim(event_socket::api('switchname'));
 					$cache = new cache;
-					$cache->delete("configuration:sofia.conf:".$hostname);
+					$cache->delete(gethostname().":configuration:sofia.conf");
 
 				//rescan the external profile to look for new or stopped gateways
 					//create the event socket connection
diff --git a/app/gateways/resources/classes/gateways.php b/app/gateways/resources/classes/gateways.php
index 2467c684ea..e5f41c9a5d 100644
--- a/app/gateways/resources/classes/gateways.php
+++ b/app/gateways/resources/classes/gateways.php
@@ -343,12 +343,9 @@
 									save_gateway_xml();
 
 								//clear the cache
-									$esl = event_socket::create();
-									if ($esl->is_connected()) {
-										$hostname = trim(event_socket::api('switchname'));
-										$cache = new cache;
-										$cache->delete("configuration:sofia.conf:".$hostname);
-									}
+
+									$cache = new cache;
+									$cache->delete(gethostname().":configuration:sofia.conf");
 
 								//rescan the sip profile to look for new or stopped gateways
 									$esl = event_socket::create();
@@ -464,7 +461,7 @@
 
 								//clear the cache
 									$esl = event_socket::create();
-									$hostname = trim(event_socket::api('switchname'));
+									$hostname = trim(event_socket::api('hostname'));
 									$cache = new cache;
 									$cache->delete("configuration:sofia.conf:".$hostname);
 
@@ -587,7 +584,7 @@
 
 								//clear the cache
 									$esl = event_socket::create();
-									$hostname = trim(event_socket::api('switchname'));
+									$hostname = trim(event_socket::api('hostname'));
 									$cache = new cache;
 									$cache->delete("configuration:sofia.conf:".$hostname);
 
diff --git a/app/sip_profiles/resources/classes/sip_profiles.php b/app/sip_profiles/resources/classes/sip_profiles.php
index 6357fbb780..be7e7d2e87 100644
--- a/app/sip_profiles/resources/classes/sip_profiles.php
+++ b/app/sip_profiles/resources/classes/sip_profiles.php
@@ -182,10 +182,9 @@
 										}
 									}
 									if ($empty_hostname) {
-										$esl = event_socket::create();
-										if ($esl->is_connected()) {
-											$hostnames[] = event_socket::api('switchname');
-										}
+
+											$hostnames[] = gethostname();
+
 									}
 
 								//clear the cache
@@ -193,7 +192,7 @@
 										$hostnames = array_unique($hostnames);
 										$cache = new cache;
 										foreach ($hostnames as $hostname) {
-											$cache->delete("configuration:sofia.conf:".$hostname);
+											$cache->delete($hostname.":configuration:sofia.conf");
 										}
 									}
 
@@ -261,10 +260,7 @@
 
 								//get system hostname if necessary
 									if (empty($sip_profile_hostname)) {
-										$esl = event_socket::create();
-										if ($esl->is_connected()) {
-											$sip_profile_hostname = event_socket::api('switchname');
-										}
+										$sip_profile_hostname = gethostname();
 									}
 
 								//clear the cache
@@ -335,16 +331,13 @@
 
 								//get system hostname if necessary
 									if (empty($sip_profile_hostname)) {
-										$esl = event_socket::create();
-										if ($esl->is_connected()) {
-											$sip_profile_hostname = event_socket::api('switchname');
-										}
+											$sip_profile_hostname = gethostname();
 									}
 
 								//clear the cache
 									if (!empty($sip_profile_hostname)) {
 										$cache = new cache;
-										$cache->delete("configuration:sofia.conf:".$sip_profile_hostname);
+										$cache->delete($sip_profile_hostname.":configuration:sofia.conf");
 									}
 
 							}
@@ -422,7 +415,7 @@
 									if ($empty_hostname) {
 										$esl = event_socket::create();
 										if ($esl->is_connected()) {
-											$hostnames[] = event_socket::api('switchname');
+											$hostnames[] = gethostname();
 										}
 									}
 
diff --git a/app/sip_profiles/sip_profile_edit.php b/app/sip_profiles/sip_profile_edit.php
index 9d5de6d718..4b1e90b00a 100644
--- a/app/sip_profiles/sip_profile_edit.php
+++ b/app/sip_profiles/sip_profile_edit.php
@@ -240,16 +240,13 @@
 			}
 
 		//get the hostname
-			if ($sip_profile_hostname == '') {
-				$esl = event_socket::create();
-				if ($esl->is_connected()) {
-					$sip_profile_hostname = event_socket::api('switchname');
-				}
+			if (empty($sip_profile_hostname) {
+					$sip_profile_hostname = gethostname();
 			}
 
 		//clear the cache
 			$cache = new cache;
-			$cache->delete("configuration:sofia.conf:".$sip_profile_hostname);
+			$cache->delete($sip_profile_hostname.":configuration:sofia.conf");
 
 		//save the sip profile xml
 			save_sip_profile_xml();
diff --git a/app/sip_status/sip_status.php b/app/sip_status/sip_status.php
index 97a3d2e626..648ee44d04 100644
--- a/app/sip_status/sip_status.php
+++ b/app/sip_status/sip_status.php
@@ -56,9 +56,8 @@
 	unset($sql);
 
 //get the sip profiles
-	if ($esl->is_connected()) {
-		$hostname = trim(event_socket::api('switchname'));
-	}
+	$hostname = gethostname();
+
 	$sql = "select sip_profile_uuid, sip_profile_name from v_sip_profiles ";
 	$sql .= "where sip_profile_enabled = true ";
 	if (!empty($hostname)) {