Case fixes, Cache result fix?