Changed cache implementation
Changed cache implementation