Fixed caching problem.