Added caching and switched wittls to use real data