I dumped this caching for now because it strikes me as dangerous.