Cache crap removed in In-progess branch