Expand from DB only to include cache