Feature/vp 142 storage cache