shoudln't we check against ContainerAwareInterface instead ?