diff --git a/changelog.txt b/changelog.txt
index d7604eca84..6d28905932 100644
--- a/changelog.txt
+++ b/changelog.txt
@@ -1,4 +1,9 @@
-Changes in version 0.6 (2004-xx-xx)
+Changes in version 0.x (2004-xx-xx)
+-----------------------------------
+
+* Fixed EH-CACHE-based caching implementation behaviour when cache exists
+
+Changes in version 0.6 (2004-08-09)
 -----------------------------------
 
 * Added domain object instance access control list (ACL) packages
diff --git a/core/src/main/java/org/acegisecurity/acl/basic/cache/EhCacheBasedAclEntryCache.java b/core/src/main/java/org/acegisecurity/acl/basic/cache/EhCacheBasedAclEntryCache.java
index 0d6e1b276d..3b21bc2ac8 100644
--- a/core/src/main/java/org/acegisecurity/acl/basic/cache/EhCacheBasedAclEntryCache.java
+++ b/core/src/main/java/org/acegisecurity/acl/basic/cache/EhCacheBasedAclEntryCache.java
@@ -106,6 +106,7 @@ public class EhCacheBasedAclEntryCache implements BasicAclEntryCache,
     public void afterPropertiesSet() throws Exception {
         if (CacheManager.getInstance().cacheExists(CACHE_NAME)) {
             // don’t remove the cache
+            cache = CacheManager.getInstance().getCache(CACHE_NAME);
         } else {
             manager = CacheManager.create();
 
diff --git a/core/src/main/java/org/acegisecurity/providers/cas/cache/EhCacheBasedTicketCache.java b/core/src/main/java/org/acegisecurity/providers/cas/cache/EhCacheBasedTicketCache.java
index 6fc5f37965..8f49acb298 100644
--- a/core/src/main/java/org/acegisecurity/providers/cas/cache/EhCacheBasedTicketCache.java
+++ b/core/src/main/java/org/acegisecurity/providers/cas/cache/EhCacheBasedTicketCache.java
@@ -96,6 +96,7 @@ public class EhCacheBasedTicketCache implements StatelessTicketCache,
     public void afterPropertiesSet() throws Exception {
         if (CacheManager.getInstance().cacheExists(CACHE_NAME)) {
             // don’t remove the cache
+            cache = CacheManager.getInstance().getCache(CACHE_NAME);
         } else {
             manager = CacheManager.create();
 
diff --git a/core/src/main/java/org/acegisecurity/providers/dao/cache/EhCacheBasedUserCache.java b/core/src/main/java/org/acegisecurity/providers/dao/cache/EhCacheBasedUserCache.java
index e511d3b8aa..a74c2bc78c 100644
--- a/core/src/main/java/org/acegisecurity/providers/dao/cache/EhCacheBasedUserCache.java
+++ b/core/src/main/java/org/acegisecurity/providers/dao/cache/EhCacheBasedUserCache.java
@@ -97,6 +97,7 @@ public class EhCacheBasedUserCache implements UserCache, InitializingBean,
     public void afterPropertiesSet() throws Exception {
         if (CacheManager.getInstance().cacheExists(CACHE_NAME)) {
             // don’t remove the cache
+            cache = CacheManager.getInstance().getCache(CACHE_NAME);
         } else {
             manager = CacheManager.create();