Fix support for expiration of periodic tasks