Fix caching issues

See #65