BugId-99483: Caching structured data - code upgrade