Index: trunk/ehcache/pom.xml
===================================================================
diff -u -N -r8438 -r8439
--- trunk/ehcache/pom.xml	(.../pom.xml)	(revision 8438)
+++ trunk/ehcache/pom.xml	(.../pom.xml)	(revision 8439)
@@ -20,7 +20,7 @@
     <maven-forge-plugin.version>1.1.7</maven-forge-plugin.version>
     <gmaven-plugin.version>1.4</gmaven-plugin.version>
     <surefire.version>2.15</surefire.version>
-    <terracotta-toolkit-api-internal.version>1.8</terracotta-toolkit-api-internal.version>
+    <terracotta-toolkit-api-internal.version>1.9</terracotta-toolkit-api-internal.version>
     <clustered-entity-management.version>0.2.0-SNAPSHOT</clustered-entity-management.version>
     <management-core.version>1.2.4-SNAPSHOT</management-core.version>
     <statistics.version>1.0.1</statistics.version>
Index: trunk/ehcache/terracotta/bootstrap/src/main/java/org/terracotta/modules/ehcache/WanAwareToolkitCache.java
===================================================================
diff -u -N -r8427 -r8439
--- trunk/ehcache/terracotta/bootstrap/src/main/java/org/terracotta/modules/ehcache/WanAwareToolkitCache.java	(.../WanAwareToolkitCache.java)	(revision 8427)
+++ trunk/ehcache/terracotta/bootstrap/src/main/java/org/terracotta/modules/ehcache/WanAwareToolkitCache.java	(.../WanAwareToolkitCache.java)	(revision 8439)
@@ -10,6 +10,7 @@
 import org.terracotta.toolkit.config.Configuration;
 import org.terracotta.toolkit.feature.NonStopFeature;
 import org.terracotta.toolkit.internal.cache.ToolkitCacheInternal;
+import org.terracotta.toolkit.internal.cache.ToolkitValueComparator;
 import org.terracotta.toolkit.internal.cache.VersionUpdateListener;
 import org.terracotta.toolkit.internal.cache.VersionedValue;
 import org.terracotta.toolkit.nonstop.NonStopException;
@@ -288,6 +289,18 @@
   }
 
   @Override
+  public boolean remove(Object key, Object value, ToolkitValueComparator<V> comparator) {
+    waitIfRequired();
+    return delegate.remove(key, value, comparator);
+  }
+
+  @Override
+  public boolean replace(K key, V oldValue, V newValue, ToolkitValueComparator<V> comparator) {
+    waitIfRequired();
+    return delegate.replace(key, oldValue, newValue, comparator);
+  }
+
+  @Override
   public boolean equals(final Object o) {
     return delegate.equals(o);
   }