Revert "Don't use system cache for now."

This reverts commit d0bdc68b02218ae22756ffecc4607ebc9af2ec24.