AFP Fonts are cached using non-unique keys

We have a highly parallelised fop-runner that creates a lot of AFP documents. In this system there can be AFP character-sets that have the same name but exactly the same (in terms of the binary). This causes obvious problems, we need to cache the character-set against the unique file URI rather than the character-set name.