Fixes to cli caching utility