Refactor SharedSchemaContextFactory