In a small saucepan, heat the first five ingredients over medium heat just until mixture comes to a simmer, stirring constantly. Remove from heat. Discard cinnamon stick; if desired, stir in cinnamon whiskey. Pour into mugs; top with whipped cream. Serve with cinnamon sticks if desired.