Adding caching to slow loading scripts
Updating test