Also implement method in caching layer