Fix lint warning
Move cache invalidation + prop exec to methods