Merge "Remove the deleted userhanle in cache to stop crashing." into nyc-mr1-dev