Add cache; Add client as singelton; updated resources;