Merge "Cache call events to ensure that cap exchange events are not missed" into main