Put a limit on metric cache and a means to clear it.
Merge branch 'master' into password_reset_email_captcha