@mmarkus That's pretty much the same conclusion I reached in bed last night :). Making CollectionFactory a per cache component, with cached key/value equivalence would simplify things quite a bit :D.