Merge "Add tests for --cache-dir option"