More changes on caching, almost there now
Added draft for caching