Revert "UseCache()" removal, to avoid API change in patch branch.