1.0.1, added Caching