Updated cache usage and messaging