[delegate] Improve caching