Revision 2384 of org.infinispan.remoting.InboundInvocationHandlerImpl adds an 30 second wait loop for stopped caches, causing RPCs to timeout. For a stopped cache, GlobalComponentRegistry.getNamedComponentRegistry(...) returns null, since its global component registry entry is removed during ComponentRegistry.stop(), yet isDefined(...) will still return true. When not using strict peer to peer, this delay is inappropriate and causes the RPC to timeout.