Ensure key_manager to clear resources: refs #280
Ensure storage class to clear resources: refs #280