Avoid requests to current app
Re-factor using events for caching events