Clear persistent cells with weak references correctly, refs #88