restored user caching
fixed joe_user stuff in integration test
fix conflicts from usercache / develop merge