Merge "Add cleanup for handlers cache."