Add reference indirection and a removal of the registration from the internal list. Before it was only be removed from the cache when cancelled and not also the main list of registrations.