Api tweaks and switched to lrucache from support lib