Fix rebind of enrichers on SubnetTier due to anonymous classes