am aa4db173: am 9a212adc: Fix 2641875 Initialize the cache path only if the...
am aa4db173: am 9a212adc: Fix 2641875 Initialize the cache path only if the container exists. This did exist before but was somehow removed. Fix a known test failure as well.
Merge commit 'aa4db173' into kraken
* commit 'aa4db173':
Fix 2641875