Issue #2186113 by Berdir: Avoid key value expire garbage collection on actual requests