Added marshalling, so caching works properly
Version bump to 1.0.0