Modal caching

Changes from feedback and docs added.

Woo!