Generalizing cache system to all indicators (#20)