refactor cache for expiration date; major overhaul of collections form