Remove cache, fix extend