Issue 7936 by sgl: Adding all hooks for expire