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

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