Improved caching amongst other things..