Couldn't we move this to TotalOrderInterceptor in order to avoid the 'sharing' between TotalOrderDistributionInterceptor and TotalOrderVersionedDistributionInterceptor?