Be symmetrical in _cache removing/restoring

I.e. since it's an attribute of STree and we remove it from there when
pickling: also restore it there when unpickling.

Signed-off-by: Giel van Schijndel <me@mortis.eu>
Merge branch 'symmetric-pickle-cache-mod'