Change DataModelService to re-use cached Builders