A better flesh-out of the caching section