resolved caching bug