Serializer: rename some fields
SerializerBase: remove static imports to prevent possible name collisions in future
Cache: move all classes into single file.