feature/cache #10

Open
qkr7828 wants to merge 12 commits from feature/cache into develop