diff --git a/paper-server/patches/sources/com/mojang/datafixers/DataFixerBuilder.java.patch b/paper-server/patches/sources/com/mojang/datafixers/DataFixerBuilder.java.patch
new file mode 100644
index 0000000000..6d1be183b0
--- /dev/null
+++ b/paper-server/patches/sources/com/mojang/datafixers/DataFixerBuilder.java.patch
@@ -0,0 +1,21 @@
+--- a/com/mojang/datafixers/DataFixerBuilder.java
++++ b/com/mojang/datafixers/DataFixerBuilder.java
+@@ -29,8 +29,10 @@
+     private final Int2ObjectSortedMap<Schema> schemas = new Int2ObjectAVLTreeMap<>();
+     private final List<DataFix> globalList = new ArrayList<>();
+     private final IntSortedSet fixerVersions = new IntAVLTreeSet();
++    private final int minDataFixPrecacheVersion; // Paper - Perf: Cache DataFixerUpper Rewrite Rules on demand
+ 
+     public DataFixerBuilder(final int dataVersion) {
++        minDataFixPrecacheVersion = Integer.getInteger("Paper.minPrecachedDatafixVersion", dataVersion+1) * 10; // Paper - Perf: default to precache nothing - mojang stores versions * 10 to allow for 'sub versions'
+         this.dataVersion = dataVersion;
+     }
+ 
+@@ -88,6 +90,7 @@
+             final IntIterator iterator = fixerUpper.fixerVersions().iterator();
+             while (iterator.hasNext()) {
+                 final int versionKey = iterator.nextInt();
++                if (versionKey < minDataFixPrecacheVersion) continue; // Paper - Perf: Cache DataFixerUpper Rewrite Rules on demand
+                 final Schema schema = schemas.get(versionKey);
+                 for (final String typeName : schema.types()) {
+                     if (!requiredTypeNames.contains(typeName)) {