I think this is fine for now, but ideally we'd move towards a setup where a key in the advice map corresponds to the hash of the underlying data. It's not clear to me what's the best way to do this - so, let's just create an issue for this.

Originally posted by @bobbinth in #1360 (comment)