Caching added
Merge conflict fixed