fix cache-breaking change and php warning from cached results