Populate handler cache which seem to be missing.
Merge pull request #85 from sbrossie/master

Populate handler cache which seem to be missing.