Add some more security to the whole invalidation thing