Fixed ContentCache issues