Revert "Expand from DB only to include cache"

This reverts commit 801f7461caf41ae98505835e4a45393bf46f817f.