reset descriptor cache during save. And refactored store/reset of CollectedStaticClasses