1 files changed, 6 insertions, 2 deletions
diff --git a/src/compiler/scala/tools/nsc/backend/jvm/GenJVM.scala b/src/compiler/scala/tools/nsc/backend/jvm/GenJVM.scala
index 2bc501cea0..b2dc217708 100644
--- a/src/compiler/scala/tools/nsc/backend/jvm/GenJVM.scala
+++ b/src/compiler/scala/tools/nsc/backend/jvm/GenJVM.scala
@@ -1726,11 +1726,15 @@ abstract class GenJVM extends SubComponent with GenJVMUtil with GenAndroid {
 
     ////////////////////// Utilities ////////////////////////
 
-    override def javaName(sym: Symbol): String = {
+    private val javaNameCache = mutable.HashMap[Symbol, String]()
+    override def javaName(sym: Symbol): String = javaNameCache.getOrElseUpdate(sym, {
       if (sym.isClass && !sym.rawowner.isPackageClass && !sym.isModuleClass)
         innerClasses = innerClasses + sym
       super.javaName(sym)
-    }
+    })
+
+    private val javaTypeCache = mutable.HashMap[Symbol, JType]()
+    override def javaType(sym: Symbol): JType = javaTypeCache.getOrElseUpdate(sym, super.javaType(sym))
 
     /** Calls to methods in 'sym' need invokeinterface? */
     def needsInterfaceCall(sym: Symbol): Boolean = {