OK I've started working on https://bugzilla.mozilla.org/show_bug.cgi?id=949280 - it is a little hairy but not too bad.

Also, based on the perf I am seeing I think this might not be caching for some reason... we should look into that, as a separate issue.