Integrate Pull Request #12 (Asset cache).  Fixes #2273