AndroidCache updated SQL hooks; @override and other tuning to remove obsolete methods