--- a/gnv-artifacts/src/main/java/de/intevation/gnv/state/StateBase.java	Mon May 31 08:20:17 2010 +0000
+++ b/gnv-artifacts/src/main/java/de/intevation/gnv/state/StateBase.java	Tue Jun 01 16:54:21 2010 +0000
@@ -959,7 +959,7 @@
     }
 
 
-    protected String getHash(String uuid) {
+    protected String getHash() {
         return this.hash;
     }
 
@@ -969,7 +969,7 @@
         if (factory.isInitialized()) {
             // we use a cache
             Cache cache = factory.getCache();
-            String key  = getHash(uuid);
+            String key  = getHash();
 
             log.debug("Using cache - key: " + key);
 
@@ -1059,6 +1059,17 @@
 
 
     public void endOfLife(Object globalContext) {
+        log.debug("end of life of the current state.");
+
+        CacheFactory factory = CacheFactory.getInstance();
+        if (factory.isInitialized()) {
+            Cache cache = factory.getCache();
+            String key  = getHash();
+
+            if (key != null && cache.remove(key)) {
+                log.info("Removed element from cache - key: " + key);
+            }
+        }
     }