Fixed CacheListener