Calling 'flags' instead of 'flag' in content_extra_field_weight() always triggers content_clear_type_cache();

The flag form element is defined as 'flag' in flag_content_extra_fields($type_name):

$extra['flag'] = array(
      'label' => t('Flags'),
      'description' => t('Flags fieldset.'),
      'weight' => 0
    );

...but the flag weight is called in flag_form_alter() like so:

 if (count($flags)) {
      $form['flag'] = array(
        '#type' => 'fieldset',
        '#weight' => module_exists('content') ? content_extra_field_weight($form['#node']->type, 'flags') : 1,
        '#tree' => TRUE,
        '#title' => t('Flags'),
        '#collapsible' => TRUE,
      );
    }

which causes content_extra_field_weight() to always fail here:

  // If we don't have the requested item, this may be because the cached
  // information for 'extra' fields hasn't been refreshed yet.
  if (!isset($type['extra'][$pseudo_field_name])) { 
    //the above looks for "$type['extra']['flags']" instead of "$type['extra']['flag']" (the value that is actually set)
    content_clear_type_cache();
    $type = content_types($type_name);
  }

which eventually causes nukage of cache_content in cache_clear_all(), and that seems bad :).

Apologies if I'm missing something, I'm not very familiar with cck internals.

Thanks!