Seems like we could do better than repeat the code 187-190 also in the ContainerListener to get the container instance. Ideally the ContainerMatcher should only be consulted once. I'm not sure how practical that is, but could at least put these lines into a method that the ContainerListener can call.