Move cache expire call in key handler