Merge pull request #432 from ozbek/master

Use cached activity instance