Here, i agree that it shouldn't be run on every page. The previous design was covering the two admin use cases only.