API Change to make it easier to cache thoroughfare clients