Reapplying patch for entity cache error
Adding a "taxes tbd" field