[TASK] Save 2 calls to the runtime cache in DataHandler