Add primitive pqs cache
Do not leave pqs system in a different state