Use the cache in more places.