diff --git a/core/src/main/java/org/geysermc/geyser/network/PacketCooldownManager.java b/core/src/main/java/org/geysermc/geyser/network/PacketCooldownManager.java
index e18f86034..a4ea29eb1 100644
--- a/core/src/main/java/org/geysermc/geyser/network/PacketCooldownManager.java
+++ b/core/src/main/java/org/geysermc/geyser/network/PacketCooldownManager.java
@@ -75,13 +75,12 @@ public class PacketCooldownManager {
         this.expiryTimeMillisDebug = 0;
     }
 
-    @Getter
     private record CooldownSettings(int cooldownMillis, int maxCount) {
-
     }
 
+
     @Getter
-    private static class CooldownTracker {
+    private class CooldownTracker {
         private long count;
         @Setter
         private long expiryTime;
@@ -89,6 +88,5 @@ public class PacketCooldownManager {
         public void incrementCount() {
             this.count++;
         }
-
     }
 }
diff --git a/core/src/main/java/org/geysermc/geyser/session/cache/FormCache.java b/core/src/main/java/org/geysermc/geyser/session/cache/FormCache.java
index 0e6291d76..f14eac28f 100644
--- a/core/src/main/java/org/geysermc/geyser/session/cache/FormCache.java
+++ b/core/src/main/java/org/geysermc/geyser/session/cache/FormCache.java
@@ -38,8 +38,7 @@ import org.geysermc.cumulus.form.impl.FormDefinitions;
 import org.geysermc.geyser.GeyserImpl;
 import org.geysermc.geyser.session.GeyserSession;
 
-import java.util.ArrayList;
-import java.util.List;
+import java.util.LinkedList;
 import java.util.Optional;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicInteger;
@@ -56,7 +55,7 @@ public class FormCache {
     private final FormDefinitions formDefinitions = FormDefinitions.instance();
     private final AtomicInteger formIdCounter = new AtomicInteger(0);
     private final Int2ObjectMap<Form> forms = new Int2ObjectOpenHashMap<>();
-    List<Integer> formsOrderList = new ArrayList<>();
+    LinkedList<Integer> formsOrderList = new LinkedList<>();
     private final GeyserSession session;
 
     public int addForm(Form form) {