Bug 933

Cache feature added, please review.
https://gist.github.com/aadamski/ba5fab6fd9233c43a03a