ported cache store system to the new api