BugId-99483: Caching structured data (next code upgrade)