Final Fix from User Handle Cache

Merged with most recent revision from master branch and resolved the conflicts