Minor cosmetic change.
Re-activate cache for non-WSS scenarii.