Caching strategy

Comparing #5 with #6