Handlers are no longer cached. For #1825.