diff --git a/CraftBukkit-Patches/0142-Configurable-UserCache-cap.patch b/CraftBukkit-Patches/0142-Configurable-UserCache-cap.patch
new file mode 100644
index 0000000000..8439b83c36
--- /dev/null
+++ b/CraftBukkit-Patches/0142-Configurable-UserCache-cap.patch
@@ -0,0 +1,37 @@
+From 9c42740a7ec62bf9e2bd8cf28ff29b02be8c98ed Mon Sep 17 00:00:00 2001
+From: drXor <mcyoungsota@gmail.com>
+Date: Fri, 25 Apr 2014 18:17:30 -0400
+Subject: [PATCH] Configurable UserCache cap
+
+
+diff --git a/src/main/java/net/minecraft/server/UserCache.java b/src/main/java/net/minecraft/server/UserCache.java
+index bcccaa9..ee8b6d6 100644
+--- a/src/main/java/net/minecraft/server/UserCache.java
++++ b/src/main/java/net/minecraft/server/UserCache.java
+@@ -206,7 +206,7 @@ public class UserCache {
+     }
+ 
+     public void c() {
+-        String s = this.b.toJson(this.a(1000));
++        String s = this.b.toJson(this.a(org.spigotmc.SpigotConfig.userCacheCap));
+         BufferedWriter bufferedwriter = null;
+ 
+         try {
+diff --git a/src/main/java/org/spigotmc/SpigotConfig.java b/src/main/java/org/spigotmc/SpigotConfig.java
+index 4703768..57b748a 100644
+--- a/src/main/java/org/spigotmc/SpigotConfig.java
++++ b/src/main/java/org/spigotmc/SpigotConfig.java
+@@ -298,4 +298,10 @@ public class SpigotConfig
+         replaceCommands = new HashSet<String>( (List<String>) getList( "commands.replace-commands",
+                 Arrays.asList( "setblock", "summon", "testforblock", "tellraw" ) ) );
+     }
++    
++    public static int userCacheCap;
++    private static void userCacheCap()
++    {
++    	userCacheCap = getInt("settings.user-cache-size", 1000);
++    }
+ }
+-- 
+1.9.1
+