Some updates to the caching-part