diff --git a/YD_AllHeartRates.Api/Utilities/AppSettings.cs b/YD_AllHeartRates.Api/Utilities/AppSettings.cs
index 464b422..bf6ef4a 100644
--- a/YD_AllHeartRates.Api/Utilities/AppSettings.cs
+++ b/YD_AllHeartRates.Api/Utilities/AppSettings.cs
@@ -14,8 +14,8 @@
         public static string[] CorsUrls { get; set; }
         public static MqttConfig Mqtt { get; set; }
 
-        public static string StudentListCacheKey = "student_list";
-        public static string DeviceListCacheKey = "device_list";
+        public static string StudentListCacheKey = $"student_list_{SchoolCode}";
+        public static string DeviceListCacheKey = $"device_list_{SchoolCode}";
         public static string SchoolCode { get; set; }
 
         public static void Init(IConfiguration configuration)