Fixed up caching and added some read later features