Adds caching and modifies default property keys.