Cache2: Fixed delayed update/build