Four long decaffeinated years have passed since our resident cabin crew coffee connoisseur Andrea last visited Shanghai. Read on for her latest third wave discoveries.