EntityServerSaveInterceptor strategy

I have a question about EntityServerSaveInterceptor and the strategy when working with entities in the ExecuteSave() method.

In our application, it's multi-tenant and so the IDataSourceKeyResolver implementation requires a keyExtension for the client database with a specific keyName.

In the ExecuteSave(), I'm trying to update some child entities of a transaction.  For instance, Order.Item.ItemHistories where the ExecuteSave() method is determining the print number for the Order and must also update a description string in the history records.

It seems like since the Item will have been modified, it's not entirely in the entity graph as the EM tried to lazy load the item and in doing so it requested a key from the IDataSourceKeyResolver but with a blank keyExtension.

So, my question is, is it best to avoid navigation properties and just look for child elements (for example em.FindEntities(ItemHistory, EntityState.Added).Where(e => e.ItemId == order.ItemId)?  This avoids any possibility of lazy loads.  Or, is there a way to prevent the entity manager from trying to do lazy loading in the EntityServerSaveInterceptor? What's the best practice here?

Thanks,
Mike