Merge "Added api to delete cache files for a given user" into nyc-dev