diff --git a/build.gradle.kts b/build.gradle.kts
index 382cb53c0..799a190f0 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -1,7 +1,7 @@
 plugins {
     java
     id("com.github.johnrengelman.shadow") version "7.0.0" apply false
-    id("io.papermc.paperweight.patcher") version "1.1.8"
+    id("io.papermc.paperweight.patcher") version "1.1.9"
 }
 
 repositories {
diff --git a/gradle.properties b/gradle.properties
index 6476c05f3..8d748be32 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -4,8 +4,9 @@ version = 1.17.1-R0.1-SNAPSHOT
 mcVersion = 1.17.1
 packageVersion = 1_17_R1
 
-paperCommit = b32a3b147cba623c87f4b72bcaa2aa4d2b4e165d
+paperCommit = 321dd1d655f988f7c7764fd8e6c4fc026c2e7a9e
 
+org.gradle.caching = true
 org.gradle.parallel = true
 org.gradle.vfs.watch = false
 org.gradle.jvmargs = -Xmx3G
diff --git a/patches/server/0001-Tuinity-Server-Changes.patch b/patches/server/0001-Tuinity-Server-Changes.patch
index 908dcdf8c..d07a04edc 100644
--- a/patches/server/0001-Tuinity-Server-Changes.patch
+++ b/patches/server/0001-Tuinity-Server-Changes.patch
@@ -17,7 +17,7 @@ You should have received a copy of the GNU General Public License
 along with this program.  If not, see <https://www.gnu.org/licenses/>.
 
 diff --git a/build.gradle.kts b/build.gradle.kts
-index b50463c2356301a1b47a0bf4f50dc1f121d363a1..b7e5bdcfe04ab7d8d8d453a787849963640262a5 100644
+index b50463c2356301a1b47a0bf4f50dc1f121d363a1..d658b7502185f1f7c938d510e2f8404fdaa66bb6 100644
 --- a/build.gradle.kts
 +++ b/build.gradle.kts
 @@ -1,10 +1,16 @@
@@ -26,7 +26,7 @@ index b50463c2356301a1b47a0bf4f50dc1f121d363a1..b7e5bdcfe04ab7d8d8d453a787849963
  import io.papermc.paperweight.tasks.BaseTask
 +import io.papermc.paperweight.tasks.GenerateReobfMappings
 +import io.papermc.paperweight.tasks.PatchMappings
-+import io.papermc.paperweight.util.Constants
++import io.papermc.paperweight.util.constants.*
  import io.papermc.paperweight.util.Git
 +import io.papermc.paperweight.util.cache
  import io.papermc.paperweight.util.defaultOutput
@@ -67,8 +67,8 @@ index b50463c2356301a1b47a0bf4f50dc1f121d363a1..b7e5bdcfe04ab7d8d8d453a787849963
 +    inputMappings.set(generateReobfMappings.flatMap { it.reobfMappings })
 +    patch.set(rootProject.layout.cache.resolve("paperweight/upstreams/paper/build-data/reobf-mappings-patch.tiny"))
 +
-+    fromNamespace.set(Constants.DEOBF_NAMESPACE)
-+    toNamespace.set(Constants.SPIGOT_NAMESPACE)
++    fromNamespace.set(DEOBF_NAMESPACE)
++    toNamespace.set(SPIGOT_NAMESPACE)
 +
 +    outputMappings.set(layout.cache.resolve("paperweight/mappings/reobf-patched.tiny"))
 +}
@@ -3765,7 +3765,7 @@ index 0000000000000000000000000000000000000000..300364f693583be802a71d94cda5d96c
 +    }
 +}
 diff --git a/src/main/java/co/aikar/timings/MinecraftTimings.java b/src/main/java/co/aikar/timings/MinecraftTimings.java
-index fe225310e4b62e7bded3521d3ddf4092c25a3645..76699e10923c72d5ab9884eb89c47a7c209f9817 100644
+index e873b23527cc4e56580c3c7dc5b52ecc3f2a9e31..6317988df19da315c057a9cbc55ff77006f45912 100644
 --- a/src/main/java/co/aikar/timings/MinecraftTimings.java
 +++ b/src/main/java/co/aikar/timings/MinecraftTimings.java
 @@ -45,6 +45,8 @@ public final class MinecraftTimings {
@@ -3778,7 +3778,7 @@ index fe225310e4b62e7bded3521d3ddf4092c25a3645..76699e10923c72d5ab9884eb89c47a7c
      private static final Map<Class<?>, String> taskNameCache = new MapMaker().weakKeys().makeMap();
  
 diff --git a/src/main/java/co/aikar/timings/TimingsExport.java b/src/main/java/co/aikar/timings/TimingsExport.java
-index 2ff4d4921e2076abf415bd3c8f5173ecd6222168..9d920565ff65a84b1b9a2a4777fd8bc8f07e0153 100644
+index cfe293881f68c8db337c3a48948362bb7b3e3522..b5728243f01aa6ea75cb42af453fd9348a5f438b 100644
 --- a/src/main/java/co/aikar/timings/TimingsExport.java
 +++ b/src/main/java/co/aikar/timings/TimingsExport.java
 @@ -153,7 +153,7 @@ public class TimingsExport extends Thread {
@@ -14150,7 +14150,7 @@ index 0f6b534a4c789a2f09f6c4624e5d58b99c7ed0e6..fea852674098fe411841d8e5ebeace7d
          this.generatingStatus = chunkstatus;
          this.writeRadiusCutoff = i;
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 68c3d744717cef8eeb16d640877157340a45e81c..b5b1aab39f881c334aa7f5f0d713f78f7265f41b 100644
+index 064aecb28f05fcf572ee7d29f611a31cc7b6e49a..c4cea533f619624976c4d1290312ed1a6b250855 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -536,6 +536,12 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
@@ -18576,7 +18576,7 @@ index f325d76c79d63629200262a77eab7cdcc9beedfa..ad23eafd6d9e7901f726977ad8404fa3
          DoubleList doubleList = this.getCoords(axis);
          if (doubleList.size() == 2 && DoubleMath.fuzzyEquals(doubleList.getDouble(0), 0.0D, 1.0E-7D) && DoubleMath.fuzzyEquals(doubleList.getDouble(1), 1.0D, 1.0E-7D)) {
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftChunk.java b/src/main/java/org/bukkit/craftbukkit/CraftChunk.java
-index 40d6dfe30e8f388fb2014ba81f9ea4a986354b88..9de4b1c9402e78c661b4d2dc7d70439e75768bc8 100644
+index 0a76032b48af4327580b99730e534f628924fe35..c9c668aa5b2ddf21ffcce8b395e3d88b4b8cf822 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftChunk.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftChunk.java
 @@ -110,13 +110,7 @@ public class CraftChunk implements Chunk {