am af61d43d: am 6d718c2f: Merge "Add support for setting the cache directory."

* commit 'af61d43d6ce065832f906757c2185c3dad74d489':
  Add support for setting the cache directory.