1 files changed, 5 insertions, 7 deletions
diff --git a/MatrixRoomUtils.Core/RuntimeCache.cs b/MatrixRoomUtils.Core/RuntimeCache.cs
index 3e9eebc..586cf88 100644
--- a/MatrixRoomUtils.Core/RuntimeCache.cs
+++ b/MatrixRoomUtils.Core/RuntimeCache.cs
@@ -1,18 +1,16 @@
-using MatrixRoomUtils.Authentication;
-using MatrixRoomUtils.Responses;
+using MatrixRoomUtils.Core.Responses;
 
-namespace MatrixRoomUtils;
+namespace MatrixRoomUtils.Core;
 
 public class RuntimeCache
 {
     public static bool WasLoaded = false;
-    public static string AccessToken { get; set; }
-    public static string? CurrentHomeserver { get; set; }
+    public static string? LastUsedToken { get; set; }
     public static AuthenticatedHomeServer CurrentHomeServer { get; set; }
     public static Dictionary<string, UserInfo> LoginSessions { get; set; } = new();
 
     public static Dictionary<string, HomeServerResolutionResult> HomeserverResolutionCache { get; set; } = new();
-    public static Dictionary<string, (DateTime cachedAt, ProfileResponse response)> ProfileCache { get; set; } = new();
+    // public static Dictionary<string, (DateTime cachedAt, ProfileResponse response)> ProfileCache { get; set; } = new();
 }
 
 
@@ -20,7 +18,7 @@ public class UserInfo
 {
     public ProfileResponse Profile { get; set; } = new();
     public LoginResponse LoginResponse { get; set; }
-    public string AccessToken { get; set; }
+    public string AccessToken { get => LoginResponse.AccessToken; }
 }
 
 public class HomeServerResolutionResult