More precaching fixes