Make caching even more efficient