Index: src/main/java/org/infinispan/remoting/InboundInvocationHandlerImpl.java
===================================================================
--- src/main/java/org/infinispan/remoting/InboundInvocationHandlerImpl.java	(revision 2424)
+++ src/main/java/org/infinispan/remoting/InboundInvocationHandlerImpl.java	(working copy)
@@ -54,16 +54,18 @@
       ComponentRegistry cr = gcr.getNamedComponentRegistry(cacheName);
 
       if (cr == null) {
-         // lets see if the cache is *defined* and perhaps just not started.
-         if (isDefined(cacheName)) {
-            log.info("Will try and wait for the cache to start");
-            long giveupTime = System.currentTimeMillis() + 30000; // arbitrary (?) wait time for caches to start
-            while (cr == null && System.currentTimeMillis() < giveupTime) {
-               Thread.sleep(100);
-               cr = gcr.getNamedComponentRegistry(cacheName);
+         if (embeddedCacheManager.getGlobalConfiguration().isStrictPeerToPeer()) {
+            // lets see if the cache is *defined* and perhaps just not started.
+            if (isDefined(cacheName)) {
+               log.info("Will try and wait for the cache to start");
+               long giveupTime = System.currentTimeMillis() + 30000; // arbitrary (?) wait time for caches to start
+               while (cr == null && System.currentTimeMillis() < giveupTime) {
+                  Thread.sleep(100);
+                  cr = gcr.getNamedComponentRegistry(cacheName);
+               }
+            } else {
+               log.info("Cache {0} is not defined.  No point in waiting.", cacheName);
             }
-         } else {
-            log.info("Cache {0} is not defined.  No point in waiting.", cacheName);
          }
 
          if (cr == null) {