Caching fix.