In the first option you are replicating code which is a bad thing. On the other hand, with the second option things are getting too complex so my question is, have you gone too far trying to abstract things?

Maybe you can find and intermediate way that removes most of the code duplication on the first solution but without trying to centralice all the intelligence in a unique complex component. Could you separate the collision handling code in an independent module and combine it with the cache one when required?