Minor cleanup. Disable cache for CLI.