merge new cache branch