Make caching more intelligent.