Fix the persistence issues with Plugin Forms in plugin manager