Merge "Fix crash/OOM in DiskBasedCache"