Now that updates are handled, be more ambitious with the caching