am dbc6d33e: Merge "Fix broken DiskBasedCache"

* commit 'dbc6d33edd721b6d7d8b40eedd26e3d0f54d0193':
  Fix broken DiskBasedCache