diff --git a/bukkit-helper-121-3/src/main/java/org/dynmap/bukkit/helper/v121_3/MapChunkCache121_3.java b/bukkit-helper-121-3/src/main/java/org/dynmap/bukkit/helper/v121_3/MapChunkCache121_3.java
index 70164258..09efa767 100644
--- a/bukkit-helper-121-3/src/main/java/org/dynmap/bukkit/helper/v121_3/MapChunkCache121_3.java
+++ b/bukkit-helper-121-3/src/main/java/org/dynmap/bukkit/helper/v121_3/MapChunkCache121_3.java
@@ -38,18 +38,15 @@ public class MapChunkCache121_3 extends GenericMapChunkCache {
 
     @Override
     protected Supplier<GenericChunk> getLoadedChunkAsync(DynmapChunk chunk) {
-        CompletableFuture<SerializableChunkData> chunkData = CompletableFuture.supplyAsync(() -> {
+        CompletableFuture<Optional<SerializableChunkData>> chunkData = CompletableFuture.supplyAsync(() -> {
             CraftWorld cw = (CraftWorld) w;
             Chunk c = cw.getHandle().getChunkIfLoaded(chunk.x, chunk.z);
-            if (c == null || !c.q) { //!c.loaded
-                return null;
+            if (c == null || !c.q) { // !c.loaded
+                return Optional.empty();
             }
-            return SerializableChunkData.a(cw.getHandle(), c); //SerializableChunkData.copyOf
+            return Optional.of(SerializableChunkData.a(cw.getHandle(), c)); // SerializableChunkData.copyOf
         }, ((CraftServer) Bukkit.getServer()).getServer());
-        return () -> {
-            NBTTagCompound nbt = chunkData.join().a(); // SerializableChunkData.write
-            return parseChunkFromNBT(new NBT.NBTCompound(nbt));
-        };
+        return () -> chunkData.join().map(SerializableChunkData::a).map(NBT.NBTCompound::new).map(this::parseChunkFromNBT).orElse(null); // SerializableChunkData::write
     }
 
     protected GenericChunk getLoadedChunk(DynmapChunk chunk) {
diff --git a/bukkit-helper-121-4/src/main/java/org/dynmap/bukkit/helper/v121_4/MapChunkCache121_4.java b/bukkit-helper-121-4/src/main/java/org/dynmap/bukkit/helper/v121_4/MapChunkCache121_4.java
index 734a5e74..a5219b23 100644
--- a/bukkit-helper-121-4/src/main/java/org/dynmap/bukkit/helper/v121_4/MapChunkCache121_4.java
+++ b/bukkit-helper-121-4/src/main/java/org/dynmap/bukkit/helper/v121_4/MapChunkCache121_4.java
@@ -38,18 +38,15 @@ public class MapChunkCache121_4 extends GenericMapChunkCache {
 
     @Override
     protected Supplier<GenericChunk> getLoadedChunkAsync(DynmapChunk chunk) {
-        CompletableFuture<SerializableChunkData> chunkData = CompletableFuture.supplyAsync(() -> {
+        CompletableFuture<Optional<SerializableChunkData>> chunkData = CompletableFuture.supplyAsync(() -> {
             CraftWorld cw = (CraftWorld) w;
             Chunk c = cw.getHandle().getChunkIfLoaded(chunk.x, chunk.z);
-            if (c == null || !c.q) { //!c.loaded
-                return null;
+            if (c == null || !c.q) { // !c.loaded
+                return Optional.empty();
             }
-            return SerializableChunkData.a(cw.getHandle(), c); //SerializableChunkData.copyOf
+            return Optional.of(SerializableChunkData.a(cw.getHandle(), c)); // SerializableChunkData.copyOf
         }, ((CraftServer) Bukkit.getServer()).getServer());
-        return () -> {
-            NBTTagCompound nbt = chunkData.join().a(); // SerializableChunkData.write
-            return parseChunkFromNBT(new NBT.NBTCompound(nbt));
-        };
+        return () -> chunkData.join().map(SerializableChunkData::a).map(NBT.NBTCompound::new).map(this::parseChunkFromNBT).orElse(null); // SerializableChunkData::write
     }
 
     protected GenericChunk getLoadedChunk(DynmapChunk chunk) {