diff --git a/Server/Controllers/ExportController.cs b/Server/Controllers/ExportController.cs
index b242f8b..856404d 100644
--- a/Server/Controllers/ExportController.cs
+++ b/Server/Controllers/ExportController.cs
@@ -12,10 +12,9 @@ namespace OI.Metrology.Server.Controllers;
 public class ExportController : Controller
 {
 
-    private readonly string _ApiUrl;
     private readonly ILogger _Logger;
-    private readonly bool _IsTestDatabase;
     private readonly AppSettings _AppSettings;
+    private readonly bool _IsTestDatabase;
     private readonly IMetrologyRepository _MetrologyRepository;
 
     public ExportController(AppSettings appSettings, ILogger<ExportController> logger, IMetrologyRepository metrologyRepository)
@@ -24,7 +23,6 @@ public class ExportController : Controller
         _AppSettings = appSettings;
         _MetrologyRepository = metrologyRepository;
         _IsTestDatabase = appSettings.ConnectionString.Contains("test", StringComparison.InvariantCultureIgnoreCase);
-        _ApiUrl = string.IsNullOrEmpty(appSettings.ApiUrl) ? Url.Content("~/") : appSettings.ApiUrl[0] == '~' ? Url.Content(appSettings.ApiUrl) : appSettings.ApiUrl;
     }
 
     public override void OnActionExecuted(ActionExecutedContext context)
@@ -33,6 +31,8 @@ public class ExportController : Controller
         ViewBag.IsTestDatabase = _IsTestDatabase;
     }
 
+    private string GetApiUrl() => string.IsNullOrEmpty(_AppSettings.ApiUrl) ? Url.Content("~/") : _AppSettings.ApiUrl[0] == '~' ? Url.Content(_AppSettings.ApiUrl) : _AppSettings.ApiUrl;
+
     [HttpGet]
     [Route("/Export")]
     public ActionResult Index()
@@ -44,7 +44,7 @@ public class ExportController : Controller
         };
         MonIn monIn = MonIn.GetInstance();
         _ = monIn.SendStatus(_AppSettings.MonASite, _AppSettings.MonAResource, "Heartbeat", State.Up);
-        ViewBag.ApiUrl = _ApiUrl;
+        ViewBag.ApiUrl = GetApiUrl();
         return View(model);
     }
 
@@ -85,7 +85,7 @@ public class ExportController : Controller
                 _ = monIn.SendStatus(_AppSettings.MonASite, _AppSettings.MonAResource, "Heartbeat", State.Warning);
             }
         }
-        ViewBag.ApiUrl = _ApiUrl;
+        ViewBag.ApiUrl = GetApiUrl();
         return View("Index", model);
     }
 
diff --git a/Server/Controllers/PagesController.cs b/Server/Controllers/PagesController.cs
index 01c1f5f..c7c52a1 100644
--- a/Server/Controllers/PagesController.cs
+++ b/Server/Controllers/PagesController.cs
@@ -9,15 +9,15 @@ namespace OI.Metrology.Server.Controllers;
 public class PagesController : Controller
 {
 
-    private readonly string _ApiUrl;
     private readonly bool _IsTestDatabase;
+    private readonly AppSettings _AppSettings;
     private readonly IMetrologyRepository _MetrologyRepository;
 
     public PagesController(AppSettings appSettings, IMetrologyRepository metrologyRepository)
     {
+        _AppSettings=appSettings;
         _MetrologyRepository = metrologyRepository;
         _IsTestDatabase = appSettings.ConnectionString.Contains("test", StringComparison.InvariantCultureIgnoreCase);
-        _ApiUrl = string.IsNullOrEmpty(appSettings.ApiUrl) ? Url.Content("~/") : appSettings.ApiUrl[0] == '~' ? Url.Content(appSettings.ApiUrl) : appSettings.ApiUrl;
     }
 
     public override void OnActionExecuted(ActionExecutedContext context)
@@ -26,11 +26,13 @@ public class PagesController : Controller
         ViewBag.IsTestDatabase = _IsTestDatabase;
     }
 
+    private string GetApiUrl() => string.IsNullOrEmpty(_AppSettings.ApiUrl) ? Url.Content("~/") : _AppSettings.ApiUrl[0] == '~' ? Url.Content(_AppSettings.ApiUrl) : _AppSettings.ApiUrl;
+
     [HttpGet]
     [Route("/")]
     public IActionResult Index()
     {
-        ViewBag.ApiUrl = _ApiUrl;
+        ViewBag.ApiUrl = GetApiUrl();
         return View("AwaitingDispo");
     }
 
@@ -39,7 +41,7 @@ public class PagesController : Controller
     [Route("/Metrology/AwaitingDispo")]
     public IActionResult AwaitingDispo()
     {
-        ViewBag.ApiUrl = _ApiUrl;
+        ViewBag.ApiUrl = GetApiUrl();
         return View();
     }
 
@@ -58,7 +60,7 @@ public class PagesController : Controller
         {
             m.HeaderAttachmentID = _MetrologyRepository.GetHeaderAttachmentID(tooltypeid, headerid);
         }
-        ViewBag.ApiUrl = _ApiUrl;
+        ViewBag.ApiUrl = GetApiUrl();
         return View(m);
     }
 
@@ -67,7 +69,7 @@ public class PagesController : Controller
     [Route("/Metrology/RunHeaders")]
     public IActionResult RunHeaders()
     {
-        ViewBag.ApiUrl = _ApiUrl;
+        ViewBag.ApiUrl = GetApiUrl();
         return View();
     }
 
diff --git a/Server/Program.cs b/Server/Program.cs
index 9daf05b..0263553 100644
--- a/Server/Program.cs
+++ b/Server/Program.cs
@@ -56,10 +56,10 @@ public class Program
         Serilog.ILogger log = Log.ForContext<Program>();
         try
         {
+            _ = webApplicationBuilder.Services.AddMemoryCache();
             _ = webApplicationBuilder.Services.Configure<ApiBehaviorOptions>(options => options.SuppressModelStateInvalidFilter = true);
             _ = webApplicationBuilder.Services.AddControllersWithViews();
             _ = webApplicationBuilder.Services.AddDistributedMemoryCache();
-            _ = webApplicationBuilder.Services.AddMemoryCache();
 
             AppSettingsRepository appSettingsRepository = new(appSettings);
             SQLDbConnectionFactory sqlDbConnectionFactory = new(appSettings);