Merge "Handle null cache directory" into jb-mr1-dev