diff --git a/java/gradle.java/src/org/netbeans/modules/gradle/java/spi/support/JavaToolchainSupport.java b/java/gradle.java/src/org/netbeans/modules/gradle/java/spi/support/JavaToolchainSupport.java
index 382d7f83915d..e4e21ee8e14e 100644
--- a/java/gradle.java/src/org/netbeans/modules/gradle/java/spi/support/JavaToolchainSupport.java
+++ b/java/gradle.java/src/org/netbeans/modules/gradle/java/spi/support/JavaToolchainSupport.java
@@ -20,8 +20,8 @@
 
 import java.io.File;
 import java.io.IOException;
-import java.util.HashMap;
 import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 import org.netbeans.api.java.platform.JavaPlatform;
@@ -48,7 +48,7 @@ public final class JavaToolchainSupport {
     private static JavaToolchainSupport instance;
     
     private JavaToolchainSupport() {
-        platformCache = new HashMap<>();
+        platformCache = new ConcurrentHashMap<>();
     }
     
     public static JavaToolchainSupport getDefault() {