I need to find some time an then will have a look at it

I've now broken up all the existing functionality into an interceptor chain, but I'd like to know whether that addresses your concern - if it doesn't let me know, I'm really trying to figure out the best path