Fix model caching for FACs; un-regress OSCs on reload