simplify/future-proof DiskLruCache usage

Change-Id: I16f7e859a34fd4d5de2d3b978687499277883f9a