MS-513 Remove todo, use cached body