diff --git a/scm-core/src/main/java/sonia/scm/cache/Cache.java b/scm-core/src/main/java/sonia/scm/cache/Cache.java
index 5282d6ede2..319cadcde1 100644
--- a/scm-core/src/main/java/sonia/scm/cache/Cache.java
+++ b/scm-core/src/main/java/sonia/scm/cache/Cache.java
@@ -33,9 +33,13 @@
 
 package sonia.scm.cache;
 
+//~--- non-JDK imports --------------------------------------------------------
+
+import sonia.scm.Filter;
+
 /**
- * The main interface for the cache. 
- * Provides methods to add, access, and remove entries from a cache. 
+ * The main interface for the cache.
+ * Provides methods to add, access, and remove entries from a cache.
  *
  * @author Sebastian Sdorra
  *
@@ -81,6 +85,18 @@ public interface Cache<K, V>
    */
   public boolean remove(K key);
 
+  /**
+   * Remove all elements with matching {@link Filter} from this cache.
+   * The method returns true if the operation was successful.
+   *
+   * @since 1.9
+   *
+   * @param filter - The filter to match cache keys
+   *
+   * @return true if the operation was successful
+   */
+  public boolean removeAll(Filter<K> filter);
+
   //~--- get methods ----------------------------------------------------------
 
   /**
diff --git a/scm-webapp/src/main/java/sonia/scm/cache/EhCache.java b/scm-webapp/src/main/java/sonia/scm/cache/EhCache.java
index dc2bd185cb..802db9d45c 100644
--- a/scm-webapp/src/main/java/sonia/scm/cache/EhCache.java
+++ b/scm-webapp/src/main/java/sonia/scm/cache/EhCache.java
@@ -40,6 +40,12 @@ import net.sf.ehcache.Element;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import sonia.scm.Filter;
+
+//~--- JDK imports ------------------------------------------------------------
+
+import java.util.Iterator;
+
 /**
  *
  * @author Sebastian Sdorra
@@ -126,6 +132,36 @@ public class EhCache<K, V> implements Cache<K, V>
     return cache.remove(key);
   }
 
+  /**
+   * Method description
+   *
+   *
+   * @param filter
+   *
+   * @return
+   */
+  @Override
+  public boolean removeAll(Filter<K> filter)
+  {
+    boolean result = true;
+    Iterator<K> it = cache.getKeys().iterator();
+
+    while (it.hasNext())
+    {
+      K key = it.next();
+
+      if (filter.accept(key))
+      {
+        if (!cache.remove(key))
+        {
+          result = false;
+        }
+      }
+    }
+
+    return result;
+  }
+
   //~--- get methods ----------------------------------------------------------
 
   /**
diff --git a/scm-webapp/src/test/java/sonia/scm/cache/EhCacheTest.java b/scm-webapp/src/test/java/sonia/scm/cache/EhCacheTest.java
new file mode 100644
index 0000000000..cfd783d5c8
--- /dev/null
+++ b/scm-webapp/src/test/java/sonia/scm/cache/EhCacheTest.java
@@ -0,0 +1,159 @@
+/**
+ * Copyright (c) 2010, Sebastian Sdorra
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright notice,
+ *    this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright notice,
+ *    this list of conditions and the following disclaimer in the documentation
+ *    and/or other materials provided with the distribution.
+ * 3. Neither the name of SCM-Manager; nor the names of its
+ *    contributors may be used to endorse or promote products derived from this
+ *    software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * http://bitbucket.org/sdorra/scm-manager
+ *
+ */
+
+
+
+package sonia.scm.cache;
+
+//~--- non-JDK imports --------------------------------------------------------
+
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+
+import sonia.scm.Filter;
+import sonia.scm.util.IOUtil;
+
+import static org.junit.Assert.*;
+
+/**
+ *
+ * @author Sebastian Sdorra
+ */
+public class EhCacheTest
+{
+
+  /**
+   * Method description
+   *
+   */
+  @After
+  public void after()
+  {
+    IOUtil.close(cm);
+  }
+
+  /**
+   * Method description
+   *
+   */
+  @Before
+  public void before()
+  {
+    cm = new EhCacheManager();
+    cache = cm.getCache(String.class, String.class, "test");
+  }
+
+  /**
+   * Method description
+   *
+   */
+  @Test
+  public void testClear()
+  {
+    cache.put("test", "test123");
+    cache.put("test-1", "test123");
+    cache.clear();
+    assertNull(cache.get("test"));
+    assertNull(cache.get("test-1"));
+  }
+
+  /**
+   * Method description
+   *
+   */
+  @Test
+  public void testContains()
+  {
+    cache.put("test", "test123");
+    cache.put("test-1", "test123");
+    assertTrue(cache.contains("test"));
+    assertTrue(cache.contains("test-1"));
+    assertFalse(cache.contains("test-2"));
+  }
+
+  /**
+   * Method description
+   *
+   */
+  @Test
+  public void testPutAndGet()
+  {
+    cache.put("test", "test123");
+    assertEquals("test123", cache.get("test"));
+  }
+
+  /**
+   * Method description
+   *
+   */
+  @Test
+  public void testRemove()
+  {
+    cache.put("test", "test123");
+    assertEquals("test123", cache.get("test"));
+    cache.remove("test");
+    assertNull(cache.get("test"));
+  }
+
+  /**
+   * Method description
+   *
+   */
+  @Test
+  public void testRemoveAll()
+  {
+    cache.put("test-1", "test123");
+    cache.put("test-2", "test123");
+    cache.put("a-1", "test123");
+    cache.put("a-2", "test123");
+    cache.removeAll(new Filter<String>()
+    {
+      @Override
+      public boolean accept(String item)
+      {
+        return item.startsWith("test");
+      }
+    });
+    assertNull(cache.get("test-1"));
+    assertNull(cache.get("test-2"));
+    assertNotNull(cache.get("a-1"));
+    assertNotNull(cache.get("a-2"));
+  }
+
+  //~--- fields ---------------------------------------------------------------
+
+  /** Field description */
+  private Cache<String, String> cache;
+
+  /** Field description */
+  private CacheManager cm;
+}