Improve clearing of cached state in subsystems.

 before running the activation actions.