Add support for EnableCaching in the cli

Fixes gh-1431