Set listener dependency back to container to avoid circular reference