Leverage caching better