FIX - bugs with the new caching class