Index: testsuite/src/main/org/jboss/test/cluster/testutil/DelegatingMockCache.java
===================================================================
--- testsuite/src/main/org/jboss/test/cluster/testutil/DelegatingMockCache.java	(revision 80006)
+++ testsuite/src/main/org/jboss/test/cluster/testutil/DelegatingMockCache.java	(revision 80405)
@@ -35,6 +35,7 @@
 import org.jboss.cache.NodeNotExistsException;
 import org.jboss.cache.Region;
 import org.jboss.cache.config.Configuration;
+import org.jboss.cache.interceptors.base.CommandInterceptor;
 import org.jgroups.Address;
 
 /**
@@ -44,16 +45,48 @@
  * @author <a href="brian.stansberry@jboss.com">Brian Stansberry</a>
  * @version $Revision: 1.1 $
  */
-public class DelegatingMockCache implements Cache
+public class DelegatingMockCache<K, V> implements Cache<K, V>
 {
-   private final Cache delegate;
+
+   private final Cache<K, V> delegate;
    
-   public DelegatingMockCache(Cache delegate) 
+   public DelegatingMockCache(Cache<K, V> delegate) 
    {
       super();
       this.delegate = delegate;
    }
    
+   public void addInterceptor(CommandInterceptor arg0, Class arg1)
+   {
+      delegate.addInterceptor(arg0, arg1);      
+   }
+
+   public void addInterceptor(CommandInterceptor arg0, int arg1)
+   {
+      delegate.addInterceptor(arg0, arg1);      
+   }
+
+   public void removeInterceptor(int arg0)
+   {
+      delegate.removeInterceptor(arg0);      
+   }
+
+   public void startBatch()
+   {
+      delegate.startBatch();    
+   }
+
+   public void endBatch(boolean arg0)
+   {
+      delegate.endBatch(arg0);      
+   }
+
+   public void removeInterceptor(Class arg0)
+   {
+      // TODO Auto-generated method stub
+      
+   }
+   
 //   public void addInterceptor(Interceptor arg0, int arg1)
 //   {
 //      delegate.addInterceptor(arg0, arg1);
@@ -269,12 +302,12 @@
       delegate.evict(arg0, arg1);
    }
 
-   public Object get(Fqn arg0, Object arg1)
+   public V get(Fqn arg0, K arg1)
    {
       return delegate.get(arg0, arg1);
    }
 
-   public Object get(String arg0, Object arg1)
+   public V get(String arg0, K arg1)
    {
       return delegate.get(arg0, arg1);
    }
@@ -369,27 +402,27 @@
       delegate.put(arg0, arg1);
    }
 
-   public Object put(Fqn arg0, Object arg1, Object arg2)
+   public V put(Fqn arg0, K arg1, V arg2)
    {
       return delegate.put(arg0, arg1, arg2);
    }
 
-   public Object put(String arg0, Object arg1, Object arg2)
+   public V put(String arg0, K arg1, V arg2)
    {
       return delegate.put(arg0, arg1, arg2);
    }
 
-   public void putForExternalRead(Fqn arg0, Object arg1, Object arg2)
+   public void putForExternalRead(Fqn arg0, K arg1, V arg2)
    {
       delegate.putForExternalRead(arg0, arg1, arg2);
    }
 
-   public Object remove(Fqn arg0, Object arg1)
+   public V remove(Fqn arg0, K arg1)
    {
       return delegate.remove(arg0, arg1);
    }
 
-   public Object remove(String arg0, Object arg1)
+   public V remove(String arg0, K arg1)
    {
       return delegate.remove(arg0, arg1);
    }
Index: testsuite/src/main/org/jboss/test/cluster/testutil/SessionTestUtil.java
===================================================================
--- testsuite/src/main/org/jboss/test/cluster/testutil/SessionTestUtil.java	(revision 80006)
+++ testsuite/src/main/org/jboss/test/cluster/testutil/SessionTestUtil.java	(revision 80405)
@@ -169,6 +169,12 @@
       config.setUseRegionBasedMarshalling(marshalling);
       config.setInactiveOnStartup(marshalling);
       
+      // No async marshalling 
+      config.setSerializationExecutorPoolSize(0);
+      // Block for commits -- no races between test driver and replication
+      config.setSyncCommitPhase(true);
+      config.setSyncRollbackPhase(true);
+      
       return config;
    }