Properly capture lambda payloads for all handler types. (#8264)

Properly capture lambda payloads for all handler types. (#8264) #3238