Make caching more effective