One more  caching tweak
Revert "Tweak caching to hopefully prevent PHP warnings"

This reverts commit 43a7582b92d413b29737fe8cdcb2f1457f40448b.
Minor performance enhancements