Should fix the double-caching issues - hopefully no repercussions!