Caching bug fixed