SOLR-17931: Fix getSolrClientCache() to leverage ObjectCache#3740

epugh wants to merge 3 commits intoapache:mainapache/solr:mainfrom

epugh:deprecation_removal_saatepugh/solr:deprecation_removal_saatCopy head branch name to clipboard