Pulled in bugfix for AspectCache