Merge pull requests 33 and 28 from mrjasonroy's repo.#34

jellylamp wants to merge 4 commits into

mrjasonroy:mainmrjasonroy/cache-components-cache-handler:mainfrom

Modea:mergePRsModea/cache-components-cache-handler:mergePRsCopy head branch name to clipboard