disabled caching bug fix