Removing quasi-broken caching from ExpressionCommand