update cache service and include tests