Index: core/src/main/java/org/infinispan/manager/DefaultCacheManager.java
===================================================================
--- core/src/main/java/org/infinispan/manager/DefaultCacheManager.java	(revision 2324)
+++ core/src/main/java/org/infinispan/manager/DefaultCacheManager.java	(revision )
@@ -406,11 +406,13 @@
       if (cacheName == null)
          throw new NullPointerException("Null arguments not allowed");
 
+      synchronized (this) {
-      if (caches.containsKey(cacheName))
-         return caches.get(cacheName);
+         if (caches.containsKey(cacheName))
+            return caches.get(cacheName);
 
-      return createCache(cacheName);
-   }
+         return createCache(cacheName);
+      }
+   }
 
    public String getClusterName() {
       return globalConfiguration.getClusterName();