rsvp: fix #937 Caching had to be for each type