Fix member caching and remove some unecessary checks