Fixed caching bug.