Merge Pull Request #13 (assetCache Part II). Fixes #2576 #2570