Change caches to adapt to the new certificate naming convention
Fixed a validity checking bug in SimplePolicyManager