Added cashing to store/index