Updated cache mechanism.