Caching fixes for RemoteEstimate.getQueryEstimate()