ISPN-4079 Enhance Cache addListener method to match types for filter and
converter

* Revamped quite a bit of the typing to have generics