Updated cache, better method names