Improved cache and favourites