CacheManager blocks during requery

This is related to Spark-26548.  The CacheManager also holds locks in uncaching and recaching plans that hold the lock while the query optimizer runs.  If the optimizer takes a long time, then the whole system can block up waiting for the optimization run.