Refactored extension actions with caching