diff --git a/API/src/main/java/cc/fascinated/services/ScoreSaberService.java b/API/src/main/java/cc/fascinated/services/ScoreSaberService.java
index 04635fb..bed23f5 100644
--- a/API/src/main/java/cc/fascinated/services/ScoreSaberService.java
+++ b/API/src/main/java/cc/fascinated/services/ScoreSaberService.java
@@ -34,8 +34,8 @@ public class ScoreSaberService {
 
     private final Map<String, ScoreSaberLeaderboardToken> leaderboardCache = ExpiringMap.builder()
             .maxSize(5_000)
-            .expirationPolicy(ExpirationPolicy.CREATED)
-            .expiration(30, TimeUnit.MINUTES)
+            .expirationPolicy(ExpirationPolicy.ACCESSED)
+            .expiration(1, TimeUnit.DAYS)
             .build();
 
     /**
@@ -79,12 +79,12 @@ public class ScoreSaberService {
      * @throws BadRequestException if an error occurred while getting the leaderboard
      */
     public ScoreSaberLeaderboardToken getLeaderboard(String leaderboardId, boolean bypassCache) {
-        if (leaderboardCache.containsKey(leaderboardId) && !bypassCache) { // The leaderboard is cached
+        if (leaderboardCache.containsKey(leaderboardId) && !bypassCache) { // The leaderboard is cached locally (very fast)
             return leaderboardCache.get(leaderboardId);
         }
 
         Optional<ScoreSaberLeaderboardToken> leaderboardOptional = leaderboardRepository.findById(leaderboardId);
-        if (leaderboardOptional.isPresent() && !bypassCache) { // The leaderboard is cached
+        if (leaderboardOptional.isPresent() && !bypassCache) { // The leaderboard is cached in the database
             ScoreSaberLeaderboardToken leaderboard = leaderboardOptional.get();
             leaderboardCache.put(leaderboardId, leaderboard);
             return leaderboard;
diff --git a/API/src/main/java/cc/fascinated/services/UserService.java b/API/src/main/java/cc/fascinated/services/UserService.java
index b32fa73..c3959ee 100644
--- a/API/src/main/java/cc/fascinated/services/UserService.java
+++ b/API/src/main/java/cc/fascinated/services/UserService.java
@@ -46,7 +46,7 @@ public class UserService {
     private final Map<String, User> userCache = ExpiringMap.builder()
             .maxSize(5_000)
             .expirationPolicy(ExpirationPolicy.ACCESSED)
-            .expiration(1, TimeUnit.HOURS)
+            .expiration(1, TimeUnit.DAYS)
             .build();
 
     @Autowired