Issue #2300131 by Berdir, alexpott: Fixed EntityResolverManager instantiates objects unnecessarily.