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 '9a212adcffbc4b32d51f512889b33ba584647aa9' into froyo-plus-aosp

* commit '9a212adcffbc4b32d51f512889b33ba584647aa9':
  Fix 2641875