df2014 Added caching, removed old stuff