diff --git a/Oqtane.Server/Controllers/InstallationController.cs b/Oqtane.Server/Controllers/InstallationController.cs
index d5b069fb..ff5e63c8 100644
--- a/Oqtane.Server/Controllers/InstallationController.cs
+++ b/Oqtane.Server/Controllers/InstallationController.cs
@@ -19,8 +19,6 @@ using System.Net.Http.Headers;
 using System.Threading.Tasks;
 using Microsoft.Extensions.Logging;
 using System.Collections.Generic;
-using System.Diagnostics;
-using static System.Net.WebRequestMethods;
 
 namespace Oqtane.Controllers
 {
@@ -105,7 +103,10 @@ namespace Oqtane.Controllers
         [HttpGet("list")]
         public List<string> List()
         {
-            return GetAssemblyList();
+            return _cache.GetOrCreate("assemblieslist", entry =>
+            {
+                return GetAssemblyList();
+            });
         }
 
         // GET api/<controller>/load?list=x,y
diff --git a/Oqtane.Server/Controllers/LanguageController.cs b/Oqtane.Server/Controllers/LanguageController.cs
index bce3db06..dc63eda8 100644
--- a/Oqtane.Server/Controllers/LanguageController.cs
+++ b/Oqtane.Server/Controllers/LanguageController.cs
@@ -12,7 +12,6 @@ using Oqtane.Shared;
 using System.Linq;
 using System.Diagnostics;
 using System.Globalization;
-using System;
 
 namespace Oqtane.Controllers
 {