I'm probably ok with making this an interface. It's backwards compatible for folk using the instance but not for any downstream projects that were creating instances. This class is internal enough that we don't mind though.