Change to the caching bug fix