Simplified expiry timestamp handling
Proper CFC name
Code cleanup, fixing package paths
Fixing return types and tests
Fixing encoding