Bug fixes in Caché class