diff --git a/framework/src/main/java/org/apache/felix/framework/FilterImpl.java b/framework/src/main/java/org/apache/felix/framework/FilterImpl.java
index 8a5a95f..d4457ca 100644
--- a/framework/src/main/java/org/apache/felix/framework/FilterImpl.java
+++ b/framework/src/main/java/org/apache/felix/framework/FilterImpl.java
@@ -133,6 +133,7 @@
         {
             evaluator = (Evaluator) tuple[0];
             mapper = (SimpleMapper) tuple[1];
+            m_cache.set(null);
         }
 
         try 
@@ -171,6 +172,10 @@
             {
                 m_cache.set(new SoftReference(new Object[] {evaluator, mapper}));
             }
+            else
+            {
+                m_cache.set(tupleRef);
+            }
         }
 
         return false;