Updated unit test and fixed some issues

- Fixed issues where Users were not coming from the cache.