Revert "Revert "store api_cache by service as well""

Reverting the revert so I can cleanly merge from branch.

Messy due to bad handling of WIP code on a master branch.

This reverts commit cc92db401aa939aee794b6f01ed07fed4fdb17dc.
better handling of api by service

separating it out as a new graph, helps deal with differing
series sizes. Layout changes to fit new graph. Fixed Y scale for
graphs.