updated Service. test cases need to be written. cache section needs ex code