Re-added credits
Added action caching