Fixed bug: caching broke CLI tools.