#133 cache query annotations