fixed up cache breaking