Fix cache command line parameter handling

Change-Id: I72fcaa6f2d25f79282b141daf50b1d3a4caf0188
4 files changed