Merge "Add support for setting the cache directory."