Merge pull request #751 from apartensky/master

Fix hcl 'save image' function to show labels for the hcl tree
Moved cache to each individual preset dataset, fetch the entire cache on a single miss