Cache
Cache and some refactoring
Merge branch 'master' of https://github.com/CMPUT301F13T07/Team07Story