Diffs: subclass cache keys, more debug info