feature/cache #7

Closed
qkr7828 wants to merge 7 commits from feature/cache into develop