diff --git a/forge-1.17.1/src/main/java/org/dynmap/forge_1_17_1/ForgeMapChunkCache.java b/forge-1.17.1/src/main/java/org/dynmap/forge_1_17_1/ForgeMapChunkCache.java
index ebf9625d..62dbb633 100644
--- a/forge-1.17.1/src/main/java/org/dynmap/forge_1_17_1/ForgeMapChunkCache.java
+++ b/forge-1.17.1/src/main/java/org/dynmap/forge_1_17_1/ForgeMapChunkCache.java
@@ -67,7 +67,7 @@ public class ForgeMapChunkCache extends GenericMapChunkCache {
 
 	private CompoundTag readChunk(int x, int z) {
 		try {
-			return cps.chunkMap.readChunk(new ChunkPos(x, z));
+			return cps.chunkMap.read(new ChunkPos(x, z));
 		} catch (Exception exc) {
 			Log.severe(String.format("Error reading chunk: %s,%d,%d", dw.getName(), x, z), exc);
 			return null;
diff --git a/forge-1.18.2/src/main/java/org/dynmap/forge_1_18_2/ForgeMapChunkCache.java b/forge-1.18.2/src/main/java/org/dynmap/forge_1_18_2/ForgeMapChunkCache.java
index 51f45c6e..4db3eac8 100644
--- a/forge-1.18.2/src/main/java/org/dynmap/forge_1_18_2/ForgeMapChunkCache.java
+++ b/forge-1.18.2/src/main/java/org/dynmap/forge_1_18_2/ForgeMapChunkCache.java
@@ -67,13 +67,14 @@ public class ForgeMapChunkCache extends GenericMapChunkCache {
 
 	private CompoundTag readChunk(int x, int z) {
 		try {
-			CompoundTag rslt = cps.chunkMap.readChunk(new ChunkPos(x, z));
+			CompoundTag rslt = cps.chunkMap.read(new ChunkPos(x, z));
 			if (rslt != null) {
-				if (rslt.contains("Level")) {
-					rslt = rslt.getCompound("Level");
+				CompoundTag lev = rslt;
+				if (lev.contains("Level")) {
+					lev = lev.getCompound("Level");
 				}
 				// Don't load uncooked chunks
-				String stat = rslt.getString("Status");
+				String stat = lev.getString("Status");
 				ChunkStatus cs = ChunkStatus.byName(stat);
 				if ((stat == null) ||
 				// Needs to be at least lighted
diff --git a/forge-1.19.2/src/main/java/org/dynmap/forge_1_19_2/ForgeMapChunkCache.java b/forge-1.19.2/src/main/java/org/dynmap/forge_1_19_2/ForgeMapChunkCache.java
index 0f9d7f2d..8a4a5013 100644
--- a/forge-1.19.2/src/main/java/org/dynmap/forge_1_19_2/ForgeMapChunkCache.java
+++ b/forge-1.19.2/src/main/java/org/dynmap/forge_1_19_2/ForgeMapChunkCache.java
@@ -68,17 +68,20 @@ public class ForgeMapChunkCache extends GenericMapChunkCache {
 
 	private CompoundTag readChunk(int x, int z) {
 		try {
-			CompoundTag rslt = cps.chunkMap.readChunk(new ChunkPos(x, z)).join().get();
-			if (rslt.contains("Level")) {
-				rslt = rslt.getCompound("Level");
-			}
-			// Don't load uncooked chunks
-			String stat = rslt.getString("Status");
-			ChunkStatus cs = ChunkStatus.byName(stat);
-			if ((stat == null) ||
-			// Needs to be at least lighted
-					(!cs.isOrAfter(ChunkStatus.LIGHT))) {
-				rslt = null;
+			CompoundTag rslt = cps.chunkMap.read(new ChunkPos(x, z)).join().get();
+			if (rslt != null) {
+				CompoundTag lev = rslt;
+				if (lev.contains("Level")) {
+					lev = lev.getCompound("Level");
+				}
+				// Don't load uncooked chunks
+				String stat = lev.getString("Status");
+				ChunkStatus cs = ChunkStatus.byName(stat);
+				if ((stat == null) ||
+				// Needs to be at least lighted
+						(!cs.isOrAfter(ChunkStatus.LIGHT))) {
+					rslt = null;
+				}
 			}
 			// Log.info(String.format("loadChunk(%d,%d)=%s", x, z, (rslt != null) ?
 			// rslt.toString() : "null"));
diff --git a/forge-1.19.3/src/main/java/org/dynmap/forge_1_19_3/ForgeMapChunkCache.java b/forge-1.19.3/src/main/java/org/dynmap/forge_1_19_3/ForgeMapChunkCache.java
index 07c4cd2b..f7605e7d 100644
--- a/forge-1.19.3/src/main/java/org/dynmap/forge_1_19_3/ForgeMapChunkCache.java
+++ b/forge-1.19.3/src/main/java/org/dynmap/forge_1_19_3/ForgeMapChunkCache.java
@@ -68,17 +68,20 @@ public class ForgeMapChunkCache extends GenericMapChunkCache {
 
 	private CompoundTag readChunk(int x, int z) {
 		try {
-			CompoundTag rslt = cps.chunkMap.readChunk(new ChunkPos(x, z)).join().get();
-			if (rslt.contains("Level")) {
-				rslt = rslt.getCompound("Level");
-			}
-			// Don't load uncooked chunks
-			String stat = rslt.getString("Status");
-			ChunkStatus cs = ChunkStatus.byName(stat);
-			if ((stat == null) ||
-			// Needs to be at least lighted
-					(!cs.isOrAfter(ChunkStatus.LIGHT))) {
-				rslt = null;
+			CompoundTag rslt = cps.chunkMap.read(new ChunkPos(x, z)).join().get();
+			if (rslt != null) {
+				CompoundTag lev = rslt;
+				if (lev.contains("Level")) {
+					lev = lev.getCompound("Level");
+				}
+				// Don't load uncooked chunks
+				String stat = lev.getString("Status");
+				ChunkStatus cs = ChunkStatus.byName(stat);
+				if ((stat == null) ||
+				// Needs to be at least lighted
+						(!cs.isOrAfter(ChunkStatus.LIGHT))) {
+					rslt = null;
+				}
 			}
 			// Log.info(String.format("loadChunk(%d,%d)=%s", x, z, (rslt != null) ?
 			// rslt.toString() : "null"));
diff --git a/forge-1.19/src/main/java/org/dynmap/forge_1_19/ForgeMapChunkCache.java b/forge-1.19/src/main/java/org/dynmap/forge_1_19/ForgeMapChunkCache.java
index 4af2b806..80f96e0e 100644
--- a/forge-1.19/src/main/java/org/dynmap/forge_1_19/ForgeMapChunkCache.java
+++ b/forge-1.19/src/main/java/org/dynmap/forge_1_19/ForgeMapChunkCache.java
@@ -68,17 +68,20 @@ public class ForgeMapChunkCache extends GenericMapChunkCache {
 
 	private CompoundTag readChunk(int x, int z) {
 		try {
-			CompoundTag rslt = cps.chunkMap.readChunk(new ChunkPos(x, z)).join().get();
-			if (rslt.contains("Level")) {
-				rslt = rslt.getCompound("Level");
-			}
-			// Don't load uncooked chunks
-			String stat = rslt.getString("Status");
-			ChunkStatus cs = ChunkStatus.byName(stat);
-			if ((stat == null) ||
-			// Needs to be at least lighted
-					(!cs.isOrAfter(ChunkStatus.LIGHT))) {
-				rslt = null;
+			CompoundTag rslt = cps.chunkMap.read(new ChunkPos(x, z)).join().get();
+			if (rslt != null) {
+				CompoundTag lev = rslt;
+				if (lev.contains("Level")) {
+					lev = lev.getCompound("Level");
+				}
+				// Don't load uncooked chunks
+				String stat = lev.getString("Status");
+				ChunkStatus cs = ChunkStatus.byName(stat);
+				if ((stat == null) ||
+				// Needs to be at least lighted
+						(!cs.isOrAfter(ChunkStatus.LIGHT))) {
+					rslt = null;
+				}
 			}
 			// Log.info(String.format("loadChunk(%d,%d)=%s", x, z, (rslt != null) ?
 			// rslt.toString() : "null"));