Fix caching
Release 1.0.17