Merged feature/caching into mainline for version 0.2.0 release
Version bump