diff --git a/patches/minecraft/net/minecraft/entity/player/EntityPlayer.java.patch b/patches/minecraft/net/minecraft/entity/player/EntityPlayer.java.patch
index d5fd44adc0..808e72395a 100644
--- a/patches/minecraft/net/minecraft/entity/player/EntityPlayer.java.patch
+++ b/patches/minecraft/net/minecraft/entity/player/EntityPlayer.java.patch
@@ -548,7 +548,30 @@
      public String getTranslatedEntityName()
      {
 -        return ScorePlayerTeam.formatPlayerName(this.getTeam(), this.username);
-+        return ScorePlayerTeam.formatPlayerName(this.getTeam(), ForgeEventFactory.getPlayerDisplayName(this, this.username));
++        return ScorePlayerTeam.formatPlayerName(this.getTeam(), this.getDisplayName());
      }
  
      public void func_110149_m(float par1)
+@@ -2257,4 +2460,22 @@
+     {
+         FMLNetworkHandler.openGui(this, mod, modGuiId, world, x, y, z);
+     }
++    /**
++     * Forge-added fields
++     */
++    private String displayname;
++
++    public String getDisplayName()
++    {
++        if(this.displayname == null)
++        {
++            this.displayname = ForgeEventFactory.getPlayerDisplayName(this, this.username);
++        }
++        return this.displayname;
++    }
++
++    public void refreshDisplayName()
++    {
++        this.displayname = ForgeEventFactory.getPlayerDisplayName(this, this.username);
++    }
+ }