am d782c57d: am 5352411a: Merge "Move cache dir to its own class."

* commit 'd782c57d376f27e511692ac6259759dd5a0bdced':
  Move cache dir to its own class.