CLC-3960 Refactor JSON cache logic
Merge pull request #2705 from raydavis/raywip

CLC-3960 Refactor JSON cache logic