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

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