JSON Hierarchy Cache, Part 2

Back from an accidental merge.