caching bug fix