Added TODOs to keep track of methods still evicting the whole answers
cache for future improvements. Additional refactoring is necessary to
implement these.