Make sure that psi elements which were cached are still valid

Make sure that psi elements which were cached are still valid #3145