v0.6.2 - Caching added