Started work on Sfx, moved caching into classes