Revert "Remove DiskCache from most places."

This reverts commit f89e575a1d4b172ce60d2751029ce11cb8eae802.

Change-Id: If0d7d63599fb5d433d25eea1539dd51183442ff2