diff --git a/server/src/handlers/http/modal/server.rs b/server/src/handlers/http/modal/server.rs
index ceb03b14f..4d72bd9af 100644
--- a/server/src/handlers/http/modal/server.rs
+++ b/server/src/handlers/http/modal/server.rs
@@ -274,10 +274,7 @@ impl Server {
                                 web::put()
                                     .to(logstream::put_enable_cache)
                                     .authorize_for_stream(Action::PutCacheEnabled),
-                            ),
-                    )
-                    .service(
-                        web::resource("/cache")
+                            )
                             // GET "/logstream/{logstream}/cache" ==> Get retention for given logstream
                             .route(
                                 web::get()
diff --git a/server/src/utils.rs b/server/src/utils.rs
index 7ad6a14e1..d1cf6a155 100644
--- a/server/src/utils.rs
+++ b/server/src/utils.rs
@@ -237,14 +237,17 @@ pub fn get_address() -> SocketAddr {
 
         let mut hostname = addr_from_env[0].to_string();
         let mut port = addr_from_env[1].to_string();
-        if hostname.starts_with('$') && port.starts_with('$') {
-            hostname = get_from_env("HOSTNAME");
-            port = get_from_env("PORT");
-            let addr = format!("{}:{}", hostname, port);
-            addr.parse::<SocketAddr>().unwrap()
-        } else {
-            CONFIG.parseable.ingestor_url.parse::<SocketAddr>().unwrap()
+        if hostname.starts_with('$') {
+            let var_hostname = hostname[1..].to_string();
+            hostname = get_from_env(&var_hostname);
         }
+        if port.starts_with('$') {
+            let var_port = port[1..].to_string();
+            port = get_from_env(&var_port);
+        }
+        format!("{}:{}", hostname, port)
+            .parse::<SocketAddr>()
+            .unwrap()
     }
 }
 fn get_from_env(var_to_fetch: &str) -> String {