Fixed stuff; still no cache