WIP: prepare cache + custom tagging