Adding caching to source