The present invention relates to an edible composition having a lipid continuous phase and self-assembled structures, the composition comprising oil, phospholipids, caffeine and water. Further aspects of the invention are the use of a composition to provide controlled release of caffeine, a composition for use in the treatment or prevention of drowsiness, the non-therapeutic use of a composition to increase mental alertness, and an edible capsule.