Fixed data caching. Caching is working now. Clean up code and output from various attempts to get cache to work.