116 fix apiserver data race

Fixes LP 1334500