Add support for checking for expired keys