1 files changed, 4 insertions, 1 deletions
diff --git a/bundles/org.eclipse.rap.e4/src/org/eclipse/rap/e4/internal/RAPAbstractObjectSupplierDispatcher.java b/bundles/org.eclipse.rap.e4/src/org/eclipse/rap/e4/internal/RAPAbstractObjectSupplierDispatcher.java
index db1e10c..32f19ee 100644
--- a/bundles/org.eclipse.rap.e4/src/org/eclipse/rap/e4/internal/RAPAbstractObjectSupplierDispatcher.java
+++ b/bundles/org.eclipse.rap.e4/src/org/eclipse/rap/e4/internal/RAPAbstractObjectSupplierDispatcher.java
@@ -26,7 +26,10 @@ public abstract class RAPAbstractObjectSupplierDispatcher<S extends ExtendedObje
 		
 		@Override
 		public void disposed(IEclipseContext context) {
-			rootContextMap.remove(context);
+			IEclipseContext rootContext = rootContextMap.remove(context);
+			if (rootContext != null) {
+				supplierCache.remove(rootContext);
+			}
 		}
 	};