Reveiew follow up: less caching