Cache rework
Signed-off-by: Alain <alain@serial-labs.com>