I would expect TypeBuilder to be a drop-in replacement for ReferenceBuilder, since TypeBuilder is the recommended way to create generic types.