Stale fields being indexed by solr on hook_entity_insert() - internal entity cache needs reset

Here's how I'm sending the node to be indexed by solr immediately on hook_entity_insert(). Note that my module is acting after filefield_paths here, and the file uri has already been updated, and is available properly if I check dpm($entity) in this function.

/**
 * Implements hook_entity_insert().
 */
function custom_helper_entity_insert($entity, $type) {
  if ($type == 'node') {
    $env_id = apachesolr_default_environment();
    $bundles_to_index = apachesolr_get_index_bundles($env_id, $type);
  
    // Check if entity should be indexed
    $info = entity_get_info($type);
    if (!empty($info['entity keys']['bundle'])) {
      $bundle = $entity->{$info['entity keys']['bundle']};
    }
    else {
      $bundle = $type;
    }
  
    if (!in_array($bundle, $bundles_to_index)) {
      return;
    }
  
    // Entity should be indexed, so send it to solr
    $ids = entity_extract_ids($type, $entity);
    $id = $ids[0];
  
    // If this entity is unpublished, remove from index
    if ($entity->status != 1) {
      apachesolr_remove_entity($env_id, $type, $id);
      return;
    }
  
    $item = new stdClass();
    $item->entity_type = $type;
    $item->entity_id = $id;
  
    module_load_include('inc', 'apachesolr', 'apachesolr.index');
    $doc = apachesolr_index_entity_to_documents($item, $env_id);
    apachesolr_index_send_to_solr($env_id, $doc);
  }
}

Patch attached: reset internal cache on entity_load() in apachesolr_index_entity_to_documents().

Seems like it might be better to make resetting the entity cache an optional parameter in apachesolr_index_entity_to_documents(), so that it doesn't always have to get reset... another patch attached.

Any chance of getting this patch reviewed/applied? I have been using it successfully for almost a year now, and it is a required patch for my apachesolr use case.

Also note that because of the default parameter value, it does not change anything for existing installations.

I think this issue can also be addressed by manually resetting the entity cache for a given entity before sending it to solr (as per this comment).

entity_get_controller($type)->resetCache(array($id));