#536 Added Cacheable annotation