Revert "Cache removal."

This reverts commit dd9d7b2e2968609659270dc7709e4649be947a7a.