backing out broken cache changes