Removed possibility of the cache ever being null