Macronutrient editing support. Better cache invalidation (by using revision value).