Updated Cache and CacheSet
Merge branch 'master' of https://github.com/enriel/CacheSimulator