Added yo ability and caching of friends fix