diff --git a/src/main/java/net/frozenorb/apiv3/model/BannedAsn.java b/src/main/java/net/frozenorb/apiv3/model/BannedAsn.java
index 3fdd9e7..886d6b1 100644
--- a/src/main/java/net/frozenorb/apiv3/model/BannedAsn.java
+++ b/src/main/java/net/frozenorb/apiv3/model/BannedAsn.java
@@ -34,7 +34,7 @@ public final class BannedAsn {
     @Getter private Instant lastUpdatedAt;
 
     public static List<BannedAsn> findAll() {
-        return bannedAsnCache;
+        return ImmutableList.copyOf(bannedAsnCache);
     }
 
     public static BannedAsn findById(int id) {
@@ -58,8 +58,8 @@ public final class BannedAsn {
                 working.put(bannedAsn.getId(), bannedAsn);
             }
 
-            bannedAsnIdCache = ImmutableMap.copyOf(working);
-            bannedAsnCache = ImmutableList.copyOf(bannedAsns);
+            bannedAsnIdCache = working;
+            bannedAsnCache = bannedAsns;
         });
     }
 
diff --git a/src/main/java/net/frozenorb/apiv3/model/BannedCellCarrier.java b/src/main/java/net/frozenorb/apiv3/model/BannedCellCarrier.java
index 28f3e22..d505e98 100644
--- a/src/main/java/net/frozenorb/apiv3/model/BannedCellCarrier.java
+++ b/src/main/java/net/frozenorb/apiv3/model/BannedCellCarrier.java
@@ -35,7 +35,7 @@ public final class BannedCellCarrier {
     @Getter private Instant lastUpdatedAt;
 
     public static List<BannedCellCarrier> findAll() {
-        return bannedCellCarrierCache;
+        return ImmutableList.copyOf(bannedCellCarrierCache);
     }
 
     public static BannedCellCarrier findById(int id) {
@@ -59,8 +59,8 @@ public final class BannedCellCarrier {
                 working.put(bannedCellCarrier.getId(), bannedCellCarrier);
             }
 
-            bannedCellCarrierIdCache = ImmutableMap.copyOf(working);
-            bannedCellCarrierCache = ImmutableList.copyOf(bannedCellCarriers);
+            bannedCellCarrierIdCache = working;
+            bannedCellCarrierCache = bannedCellCarriers;
         });
     }
 
diff --git a/src/main/java/net/frozenorb/apiv3/model/Rank.java b/src/main/java/net/frozenorb/apiv3/model/Rank.java
index e882bae..0b33314 100644
--- a/src/main/java/net/frozenorb/apiv3/model/Rank.java
+++ b/src/main/java/net/frozenorb/apiv3/model/Rank.java
@@ -34,7 +34,7 @@ public final class Rank {
     @Getter private boolean staffRank;
 
     public static List<Rank> findAll() {
-        return rankCache;
+        return ImmutableList.copyOf(rankCache);
     }
 
     public static Rank findById(String id) {
@@ -58,8 +58,8 @@ public final class Rank {
                 working.put(rank.getId(), rank);
             }
 
-            rankIdCache = ImmutableMap.copyOf(working);
-            rankCache = ImmutableList.copyOf(ranks);
+            rankIdCache = working;
+            rankCache = ranks;
         });
     }
 
diff --git a/src/main/java/net/frozenorb/apiv3/model/Server.java b/src/main/java/net/frozenorb/apiv3/model/Server.java
index 8d65c14..af71a15 100644
--- a/src/main/java/net/frozenorb/apiv3/model/Server.java
+++ b/src/main/java/net/frozenorb/apiv3/model/Server.java
@@ -37,7 +37,7 @@ public final class Server {
     @Getter @ExcludeFromReplies private Set<UUID> players;
 
     public static List<Server> findAll() {
-        return serverCache;
+        return ImmutableList.copyOf(serverCache);
     }
 
     public static Server findById(String id) {
@@ -62,8 +62,8 @@ public final class Server {
                 working.put(server.getId(), server);
             }
 
-            serverIdCache = ImmutableMap.copyOf(working);
-            serverCache = ImmutableList.copyOf(servers);
+            serverIdCache = working;
+            serverCache = servers;
         });
     }
 
diff --git a/src/main/java/net/frozenorb/apiv3/model/ServerGroup.java b/src/main/java/net/frozenorb/apiv3/model/ServerGroup.java
index 5f9b82f..d217ca0 100644
--- a/src/main/java/net/frozenorb/apiv3/model/ServerGroup.java
+++ b/src/main/java/net/frozenorb/apiv3/model/ServerGroup.java
@@ -32,7 +32,7 @@ public final class ServerGroup {
     @Getter @Setter @ExcludeFromReplies private Map<String, List<String>> permissions;
 
     public static List<ServerGroup> findAll() {
-        return serverGroupCache;
+        return ImmutableList.copyOf(serverGroupCache);
     }
 
     public static ServerGroup findById(String id) {
@@ -56,8 +56,8 @@ public final class ServerGroup {
                 working.put(serverGroup.getId(), serverGroup);
             }
 
-            serverGroupIdCache = ImmutableMap.copyOf(working);
-            serverGroupCache = ImmutableList.copyOf(serverGroups);
+            serverGroupIdCache = working;
+            serverGroupCache = serverGroups;
         });
     }