Don't switch cache  if --no-cache-update is specified
Merge pull request #1892 from rajinir/pull-req-master-f2f5dab8f0012f5d30f3d2559d7c164216f7f937

Do not switch cache branch when --no-cache-update is specified [1/1]