Per review comments, save generated format directly in Storage, rather than separately where it can get out of sync.