Don't re-wrap sources that have already been cached
Include callback properties in cache keys

Fixes #1
0.2.0