Issue 7, remove all references to the now removed hot cache