Revert "UseCache()" removal, to avoid API change in patch branch.
make version v5-34-10.