Changed the behaviour from eager caching to lazy caching.