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

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