BugId-99483: Added caching for structured data