Enhance check expiration performance
Merge pull request #261 from pgiraud/expiration_perf

Enhance check expiration performance