VID-2142 More docs, Aync cache stuff and cleanup