Merge "Create WAP cache and API for retrieving WAP message sizes." into main