FA does make a Whipped Cream flavor. At this time, it is in the Kitchen Flavors line, meaning, not formulated to inhalation. It notes on their website that it contains diacetyl. Last I knew of anyone selling it in the states was ECX. Many people do still use flavorings from the kitchen line. They generally go into it it "knowing" that it contains the "baddies".
News is getting around the FA is possibly reformulating some of their kitchen flavors to be more vape friendly, removing the usual suspects.