Fix cached thumbs bug in SPW. See #10827