Fixed crappy return issue which was shitting on the cache