Merge "Move cache dir to its own class."