merge feat/cache

Merging feat/cache with dev branch

Merge request reports

Loading