Fix caching issue (fixes #106)