Improved caching a lot.