Revert "Runtime query caching that really works"

This reverts commit 994df7779f781bdac2b48beb0989f8acf6adc053.
Revert "Revert "Runtime query caching that really works""

This reverts commit 0932e8185aad52c6c62166b9702c1df3c85c7253.
Merge branch '2.3/develop' of github.com:pyrocms/pyrocms into 2.3/develop
Plugin work