Update getByIdCacheOrRemote and added test.