Added handler caching.