BUG-865: remove SchemaContextHolder