Adjust the way that cache is fetched

* Code cleanliness
* Avoid empty cache hits