Added caching datastructures