#536 Added Cacheable annotation
#536 fixing implementation
#536 added super
Merge remote branch 'fork/536'