Only override the options.force message if it is set on the command line.
Minor clean up.
Implemented support for a caching policy.