diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/script/ScriptService.java b/modules/elasticsearch/src/main/java/org/elasticsearch/script/ScriptService.java
index 72aac1815a6..3313da79b7b 100644
--- a/modules/elasticsearch/src/main/java/org/elasticsearch/script/ScriptService.java
+++ b/modules/elasticsearch/src/main/java/org/elasticsearch/script/ScriptService.java
@@ -19,13 +19,13 @@
 
 package org.elasticsearch.script;
 
+import org.elasticsearch.common.collect.MapMaker;
 import org.elasticsearch.common.component.AbstractComponent;
 import org.elasticsearch.common.inject.Inject;
 import org.elasticsearch.common.math.UnboxedMathUtils;
 import org.elasticsearch.common.mvel2.MVEL;
 import org.elasticsearch.common.mvel2.ParserContext;
 import org.elasticsearch.common.settings.Settings;
-import org.elasticsearch.common.util.concurrent.ConcurrentCollections;
 
 import java.lang.reflect.Method;
 import java.lang.reflect.Modifier;
@@ -37,7 +37,7 @@ import java.util.concurrent.ConcurrentMap;
  */
 public class ScriptService extends AbstractComponent {
 
-    private final ConcurrentMap<String, Object> cache = ConcurrentCollections.newConcurrentMap();
+    private final ConcurrentMap<String, Object> cache = new MapMaker().softValues().makeMap();
 
     private final ParserContext parserContext;