Remove old plane caching approach