Added more cache service