Yes, probably that's the esiest approach, I suspect that something isn't working properly with theme inheritance and theme cache stuff. You can also try something like this to force cache reload.