Merge "Don't create cache directory for isolated processes" into jb-mr1-dev