diff --git a/compiler/container/src/org/jetbrains/kotlin/container/Cache.kt b/compiler/container/src/org/jetbrains/kotlin/container/Cache.kt
index a04dc039133..d79acc977ab 100644
--- a/compiler/container/src/org/jetbrains/kotlin/container/Cache.kt
+++ b/compiler/container/src/org/jetbrains/kotlin/container/Cache.kt
@@ -21,7 +21,7 @@ import java.lang.reflect.*
 import java.util.*
 
 private object ClassTraversalCache {
-    private val cache = ContainerUtil.createConcurrentWeakKeySoftValueMap<Class<*>, ClassInfo>()
+    private val cache = ContainerUtil.newConcurrentMap<Class<*>, ClassInfo>()
 
     fun getClassInfo(c: Class<*>): ClassInfo {
         val classInfo = cache.get(c)
diff --git a/compiler/container/src/org/jetbrains/kotlin/container/Storage.kt b/compiler/container/src/org/jetbrains/kotlin/container/Storage.kt
index 8f7deff93bc..0694e680e7d 100644
--- a/compiler/container/src/org/jetbrains/kotlin/container/Storage.kt
+++ b/compiler/container/src/org/jetbrains/kotlin/container/Storage.kt
@@ -19,7 +19,6 @@ package org.jetbrains.kotlin.container
 import com.intellij.util.containers.MultiMap
 import java.io.Closeable
 import java.io.PrintStream
-import java.lang.IllegalStateException
 import java.lang.reflect.Modifier
 import java.lang.reflect.ParameterizedType
 import java.lang.reflect.Type
@@ -86,7 +85,7 @@ class ComponentStorage(private val myId: String, parent: ComponentStorage?) : Va
         }
     }
 
-    fun dump(printer: PrintStream): Unit = with (printer) {
+    fun dump(printer: PrintStream): Unit = with(printer) {
         val heading = "Container: $myId"
         println(heading)
         println("=".repeat(heading.length))
@@ -158,7 +157,10 @@ class ComponentStorage(private val myId: String, parent: ComponentStorage?) : Va
         }
     }
 
-    private fun inspectDependenciesAndRegisterAdhoc(context: ComponentResolveContext, descriptors: Collection<ComponentDescriptor>): LinkedHashSet<ComponentDescriptor> {
+    private fun inspectDependenciesAndRegisterAdhoc(
+        context: ComponentResolveContext,
+        descriptors: Collection<ComponentDescriptor>
+    ): LinkedHashSet<ComponentDescriptor> {
         val adhoc = LinkedHashSet<ComponentDescriptor>()
         val visitedTypes = HashSet<Type>()
         for (descriptor in descriptors) {
@@ -168,8 +170,9 @@ class ComponentStorage(private val myId: String, parent: ComponentStorage?) : Va
         return adhoc
     }
 
-    private fun collectAdhocComponents(context: ComponentResolveContext, descriptor: ComponentDescriptor,
-                                       visitedTypes: HashSet<Type>, adhocDescriptors: LinkedHashSet<ComponentDescriptor>
+    private fun collectAdhocComponents(
+        context: ComponentResolveContext, descriptor: ComponentDescriptor,
+        visitedTypes: HashSet<Type>, adhocDescriptors: LinkedHashSet<ComponentDescriptor>
     ) {
         val dependencies = descriptor.getDependencies(context)
         for (type in dependencies) {