Fix: Crash when parsing cache lists
Some TP improvements