Fixed annotation cache bug