[BZ 1069545] Add code that indepdently persists the subcategories.