remove DiskCacheProvider
adapt android code (get rid of DiskCacheProvider usage)