Shift echo service to new internal api, ensure local services can respond to local clients