v0.16 - Improved caching