Fix cull test failures
Fix more test failures
Fix typo
Fix Cache.__contains__