apparently, I place too much trust in Eclipse's Inline refactoring
also, fix condition on caching